summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorHoward Pritchard <hppritcha@gmail.com>2018-09-18 17:26:34 -0600
committerChristoph Junghans <christoph.junghans@gmail.com>2018-09-18 17:26:34 -0600
commit21884d804f37788e9b64061b6f2e56642e7e9a74 (patch)
treee5829873b4e964fa1e73487900dfd07351999cba /var
parent41de79a1b6da68797318e70b9072a528951ebbe1 (diff)
downloadspack-21884d804f37788e9b64061b6f2e56642e7e9a74.tar.gz
spack-21884d804f37788e9b64061b6f2e56642e7e9a74.tar.bz2
spack-21884d804f37788e9b64061b6f2e56642e7e9a74.tar.xz
spack-21884d804f37788e9b64061b6f2e56642e7e9a74.zip
libhio: add patch for 1.4.1.2 release (#9270)
Turns out that there was a configury problem in libhio which caused issues building the package on non-cray systems, aka when using mpicc and friends. Signed-off-by: Howard Pritchard <hppritcha@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch31
-rw-r--r--var/spack/repos/builtin/packages/libhio/package.py2
2 files changed, 33 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch b/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch
new file mode 100644
index 0000000000..f9b8b8e163
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libhio/0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch
@@ -0,0 +1,31 @@
+From f6f806c2ea46866c9490d2d2ddc3f119666d26d4 Mon Sep 17 00:00:00 2001
+From: Howard Pritchard <hppritcha@gmail.com>
+Date: Mon, 17 Sep 2018 05:05:01 -0600
+Subject: [PATCH] spack: fix for spack to work on non-cray systems
+
+or when one wants to use Open MPI on a cray system with spack.
+The problem is that when using an MPI with spack, its going to
+use a long value for the CC and CXX variables. This confused
+the libhio configury, resulting in it being built without mpi
+support, leading to failure of xexec to properly compile, etc.
+
+This commit fixes that problem.
+
+Signed-off-by: Howard Pritchard <hppritcha@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index afab5553..62d35c85 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ if ( test -n "$XTOS_VERSION" || test -n "$CRAYPE_DIR" ) && (test -z $CC || test
+ if test ! -n "$LD" ; then
+ LD=ld
+ fi
+-elif test ${MPICC} = "mpicc" ; then
++elif test -n "$MPICC" ; then
+ CC=${MPICC}
+ CXX=${MPICXX}
+ hio_use_mpi=1
+--
+1.8.3.1
+
diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py
index ff5f28202e..fec5242d5c 100644
--- a/var/spack/repos/builtin/packages/libhio/package.py
+++ b/var/spack/repos/builtin/packages/libhio/package.py
@@ -64,6 +64,7 @@ class Libhio(AutotoolsPackage):
#
patch('0001-configury-fix-a-problem-with-bz2-configury.patch', when="@1.4.1.0")
patch('0001-hdf5-make-docs-optional.patch', when="@1.4.1.0")
+ patch('0001-spack-fix-for-spack-to-work-on-non-cray-systems.patch', when="@1.4.1.2")
def autoreconf(self, spec, prefix):
autoreconf = which('autoreconf')
@@ -76,4 +77,5 @@ class Libhio(AutotoolsPackage):
args.append('--with-external_bz2={0}'.format(spec['bzip2'].prefix))
if '+hdf5' in spec:
args.append('--with-hdf5={0}'.format(spec['hdf5'].prefix))
+
return args