summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukebroskop <luke.roskop@hpe.com>2021-05-11 11:33:58 -0500
committerGitHub <noreply@github.com>2021-05-11 09:33:58 -0700
commit766f99f1302e9d4be120815d239016365452b01d (patch)
treec551a52e71b8ffde4912e06ea43bd74ca7277a62
parentb4e4e76872004483765e0cba2f7eed7cb3aad8be (diff)
downloadspack-766f99f1302e9d4be120815d239016365452b01d.tar.gz
spack-766f99f1302e9d4be120815d239016365452b01d.tar.bz2
spack-766f99f1302e9d4be120815d239016365452b01d.tar.xz
spack-766f99f1302e9d4be120815d239016365452b01d.zip
CrayPE fix for libcircle (#23526)
Disable mpi search when using cce (the CCE compiler wrappers do not behave like the conventional mpi compiler wrappers).
-rw-r--r--var/spack/repos/builtin/packages/libcircle/CrayPE_configure-ac.patch17
-rw-r--r--var/spack/repos/builtin/packages/libcircle/package.py8
2 files changed, 25 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libcircle/CrayPE_configure-ac.patch b/var/spack/repos/builtin/packages/libcircle/CrayPE_configure-ac.patch
new file mode 100644
index 0000000000..40a89f80ba
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libcircle/CrayPE_configure-ac.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac_new
+index 49fcc1c..f0d3d2a 100644
+--- a/configure.ac
++++ b/configure.ac_new
+@@ -59,9 +59,9 @@ AC_SUBST([LIBCIRCLE_SO_VERSION], [3:1:1])
+ AC_SUBST([LIBCIRCLE_API_VERSION], [0.3.0])
+
+ # Check for MPI
+-LX_FIND_MPI
+-test "x$have_C_mpi" = xyes || \
+- AC_MSG_ERROR([You should check to see if MPI is setup properly.])
++#LX_FIND_MPI
++#test "x$have_C_mpi" = xyes || \
++# AC_MSG_ERROR([You should check to see if MPI is setup properly.])
+ AM_CONDITIONAL(HAVE_MPI, [test "x$have_C_mpi" = xyes])
+
+ echo
diff --git a/var/spack/repos/builtin/packages/libcircle/package.py b/var/spack/repos/builtin/packages/libcircle/package.py
index e4b68c2df6..019e2a68aa 100644
--- a/var/spack/repos/builtin/packages/libcircle/package.py
+++ b/var/spack/repos/builtin/packages/libcircle/package.py
@@ -21,6 +21,14 @@ class Libcircle(AutotoolsPackage):
depends_on('mpi')
depends_on('pkgconfig', type='build')
depends_on('libpciaccess', type='link')
+ depends_on('autoconf', when='%cce')
+ depends_on('automake', when='%cce')
+
+ patch('CrayPE_configure-ac.patch', when='%cce')
+
+ @property
+ def force_autoreconf(self):
+ return self.spec.satisfies('%cce')
@when('@master')
def autoreconf(self, spec, prefix):