diff options
| -rw-r--r-- | libraries/hpx/gcc7.patch | 23 | ||||
| -rw-r--r-- | libraries/hpx/hpx.SlackBuild | 8 | ||||
| -rw-r--r-- | libraries/hpx/hpx.info | 6 |
3 files changed, 4 insertions, 33 deletions
diff --git a/libraries/hpx/gcc7.patch b/libraries/hpx/gcc7.patch deleted file mode 100644 index ab8d5cb94a5af..0000000000000 --- a/libraries/hpx/gcc7.patch +++ /dev/null @@ -1,23 +0,0 @@ -From cc15d1c67144200f070e74d80b6d840df0a16ee3 Mon Sep 17 00:00:00 2001 -From: Thomas Heller <thomas.heller@cs.fau.de> -Date: Thu, 4 May 2017 08:15:13 +0200 -Subject: [PATCH] Fixing uninitialized usage warning with gcc 7 - ---- - src/runtime/parcelset/parcel.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/parcelset/parcel.cpp b/src/runtime/parcelset/parcel.cpp -index 0f86c4043a1..56714af4c7b 100644 ---- a/src/runtime/parcelset/parcel.cpp -+++ b/src/runtime/parcelset/parcel.cpp -@@ -47,7 +47,8 @@ namespace hpx { namespace parcelset - creation_time_(util::high_resolution_timer::now()), - #endif - source_id_(naming::invalid_gid), -- dest_(naming::invalid_gid) -+ dest_(naming::invalid_gid), -+ has_continuation_(false) - {} - - parcel_data::parcel_data(naming::gid_type&& dest, naming::address&& addr, diff --git a/libraries/hpx/hpx.SlackBuild b/libraries/hpx/hpx.SlackBuild index eeb0e2adf0b80..dd4f999a34a14 100644 --- a/libraries/hpx/hpx.SlackBuild +++ b/libraries/hpx/hpx.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hpx -VERSION=${VERSION:-1.0.0} +VERSION=${VERSION:-1.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -79,15 +79,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# From upstream -patch -p1 < $CWD/gcc7.patch - mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DHPX_WITH_CXX11=On \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB=lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release \ @@ -110,8 +106,6 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE_1_0.txt README.rst $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/$PRGNAM-$VERSION/docs/html $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf $PKG/usr/share/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/hpx/hpx.info b/libraries/hpx/hpx.info index d25a35a792ae8..40ea3adb022d2 100644 --- a/libraries/hpx/hpx.info +++ b/libraries/hpx/hpx.info @@ -1,8 +1,8 @@ PRGNAM="hpx" -VERSION="1.0.0" +VERSION="1.7.1" HOMEPAGE="https://github.com/STEllAR-GROUP/hpx/" -DOWNLOAD="https://github.com/STEllAR-GROUP/hpx/archive/1.0.0/hpx-1.0.0.tar.gz" -MD5SUM="16fd3d6eeb18758a493d38c2c46b2213" +DOWNLOAD="https://github.com/STEllAR-GROUP/hpx/archive/1.7.1/hpx-1.7.1.tar.gz" +MD5SUM="322dc94eaebf3e01d4c276fabe326441" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="numactl hwloc gperftools" |