summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2017-06-21 18:04:09 +0200
committer Robby Workman2021-04-18 06:28:52 +0200
commitf8d36c25b53c72920186aea5b944c3c8ac0a57d5 (patch)
treea4f0fc3e1e560f968996d0d01a90113657b60d79
parent72747f8cfda073c4040271450c87d72c534c603c (diff)
downloadslackbuilds-f8d36c25b53c72920186aea5b944c3c8ac0a57d5.tar.gz
libraries/hpx: Forced c++11 and added a patch for gcc >= 7.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/hpx/gcc7.patch23
-rw-r--r--libraries/hpx/hpx.SlackBuild4
2 files changed, 27 insertions, 0 deletions
diff --git a/libraries/hpx/gcc7.patch b/libraries/hpx/gcc7.patch
new file mode 100644
index 0000000000..ab8d5cb94a
--- /dev/null
+++ b/libraries/hpx/gcc7.patch
@@ -0,0 +1,23 @@
+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 0dbdd285e9..5156a21773 100644
--- a/libraries/hpx/hpx.SlackBuild
+++ b/libraries/hpx/hpx.SlackBuild
@@ -69,11 +69,15 @@ 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 \