summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/hpx5/configure.patch36
-rw-r--r--var/spack/repos/builtin/packages/hpx5/package.py3
2 files changed, 39 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/hpx5/configure.patch b/var/spack/repos/builtin/packages/hpx5/configure.patch
new file mode 100644
index 0000000000..9ac8e24849
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hpx5/configure.patch
@@ -0,0 +1,36 @@
+--- a/hpx/configure
++++ b/hpx/configure
+@@ -18002,33 +18002,21 @@
+ case $PE_ENV in #(
+ CRAY*) :
+
+- LIBHPX_CPPFLAGS="$LIBHPX_CPPFLAGS ‐h noomp"
+- LIBHPX_CFLAGS="$LIBHPX_CFLAGS -h nomessage=1254"
+- LIBHPX_CCASFLAGS="$LIBHPX_CCASFLAGS -h gnu -h nomessage=1254"
+ ;; #(
+ PGI*) :
+
+ ;; #(
+ GNU*) :
+
+- hpx_pe_env_cflags_pedantic="-pedantic"
+- hpx_pe_env_cflags_wall="-Wall"
+ ;; #(
+ INTEL*) :
+
+ # icc complains about our use of gcc memory model macros, but the complaint
+ # isn't a problem or helpful, so suppress that one warning. The sync headers
+ # aren't included by HPX so external users don't care.
+- LIBHPX_CFLAGS="$LIBHPX_CFLAGS -wd32013"
+- HPX_APPS_CFLAGS="$HPX_APPS_CFLAGS -wd32013"
+- hpx_pe_env_cflags_pedantic="-pedantic"
+- hpx_pe_env_cflags_wall="-Wall"
+ ;; #(
+ CLANG*) :
+
+- LIBHPX_CPPFLAGS="$LIBHPX_CPPFLAGS -Wno-gnu-zero-variadic-macro-arguments -Wno-unused-private-field"
+- hpx_pe_env_cflags_pedantic="-pedantic"
+- hpx_pe_env_cflags_wall="-Wall"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown programming environment" >&5
+ $as_echo "$as_me: WARNING: Unknown programming environment" >&2;} ;; #(
diff --git a/var/spack/repos/builtin/packages/hpx5/package.py b/var/spack/repos/builtin/packages/hpx5/package.py
index a32fb6dd4f..a1b1b0fc6b 100644
--- a/var/spack/repos/builtin/packages/hpx5/package.py
+++ b/var/spack/repos/builtin/packages/hpx5/package.py
@@ -47,6 +47,9 @@ class Hpx5(AutotoolsPackage):
version('1.1.0', '646afb460ecb7e0eea713a634933ce4f')
version('1.0.0', '8020822adf6090bd59ed7fe465f6c6cb')
+ # Don't second-guess what compiler we are using on Cray
+ patch("configure.patch", when='@4.0.0')
+
variant('cuda', default=False, description='Enable CUDA support')
variant('cxx11', default=False, description='Enable C++11 hpx++ interface')
variant('debug', default=False, description='Build debug version of HPX-5')