diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2019-08-21 13:28:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 13:28:20 -0400 |
| commit | 77e4e3d87e2c63ca65130bdfaefb811fb931a812 (patch) | |
| tree | 51480e5c736f07b01f99375496db41d38a398a3d /var | |
| parent | 2441c0bad7d21765142525bd1f80221a0e77c92c (diff) | |
| download | spack-77e4e3d87e2c63ca65130bdfaefb811fb931a812.tar.gz spack-77e4e3d87e2c63ca65130bdfaefb811fb931a812.tar.bz2 spack-77e4e3d87e2c63ca65130bdfaefb811fb931a812.tar.xz spack-77e4e3d87e2c63ca65130bdfaefb811fb931a812.zip | |
mercury: Fix CMake 3.15 configure error (#12504)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mercury/fix-cmake-3.15-check_symbol_exists.patch | 30 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mercury/package.py | 4 |
2 files changed, 34 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/mercury/fix-cmake-3.15-check_symbol_exists.patch b/var/spack/repos/builtin/packages/mercury/fix-cmake-3.15-check_symbol_exists.patch new file mode 100644 index 0000000000..dd28ae0eff --- /dev/null +++ b/var/spack/repos/builtin/packages/mercury/fix-cmake-3.15-check_symbol_exists.patch @@ -0,0 +1,30 @@ +diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt +index 69d1dfab..88746473 100644 +--- a/src/util/CMakeLists.txt ++++ b/src/util/CMakeLists.txt +@@ -16,6 +16,7 @@ set(MERCURY_UTIL_BUILD_INCLUDE_DEPENDENCIES + # External dependencies + #------------------------------------------------------------------------------ + include(CheckIncludeFiles) ++include(CheckSymbolExists) + include(CheckTypeSize) + + # Threads +@@ -35,7 +36,7 @@ if(CMAKE_USE_PTHREADS_INIT) + check_type_size(PTHREAD_MUTEX_ADAPTIVE_NP HG_UTIL_HAS_PTHREAD_MUTEX_ADAPTIVE_NP) + + # Detect pthread_condattr_setclock +- CHECK_SYMBOL_EXISTS(pthread_condattr_setclock pthread.h HG_UTIL_HAS_PTHREAD_CONDATTR_SETCLOCK) ++ check_symbol_exists(pthread_condattr_setclock pthread.h HG_UTIL_HAS_PTHREAD_CONDATTR_SETCLOCK) + endif() + + # Rt +@@ -57,7 +58,7 @@ mark_as_advanced(MERCURY_USE_MONOTONIC_CLOCK) + check_include_files("time.h" HG_UTIL_HAS_TIME_H) + if(HG_UTIL_HAS_TIME_H) + # Detect clock_gettime +- CHECK_SYMBOL_EXISTS(clock_gettime time.h HG_UTIL_HAS_CLOCK_GETTIME) ++ check_symbol_exists(clock_gettime time.h HG_UTIL_HAS_CLOCK_GETTIME) + endif() + + # Detect <sys/time.h> diff --git a/var/spack/repos/builtin/packages/mercury/package.py b/var/spack/repos/builtin/packages/mercury/package.py index 87abf1069e..d6eb21cb40 100644 --- a/var/spack/repos/builtin/packages/mercury/package.py +++ b/var/spack/repos/builtin/packages/mercury/package.py @@ -52,6 +52,10 @@ class Mercury(CMakePackage): conflicts('+ofi', when='@:0.9') # libfabric support was added in 1.0.0 conflicts('~ofi', when='+udreg') # udreg option is specific to OFI + # Fix CMake check_symbol_exists + # See https://github.com/mercury-hpc/mercury/issues/299 + patch('fix-cmake-3.15-check_symbol_exists.patch', when='@:1.0.1') + def cmake_args(self): """Populate cmake arguments for Mercury.""" spec = self.spec |