diff options
| author | Christoph Junghans <junghans@lanl.gov> | 2019-09-25 11:29:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 11:29:43 -0600 |
| commit | ccfe8aaf76f8fc294ea1bf0a9a1cd829c4166c5f (patch) | |
| tree | 479b573029e374b818f53d6302a9a31ef8aa4e6d | |
| parent | e123058721952dcc552105e63315f64e3b189b1f (diff) | |
| download | spack-ccfe8aaf76f8fc294ea1bf0a9a1cd829c4166c5f.tar.gz spack-ccfe8aaf76f8fc294ea1bf0a9a1cd829c4166c5f.tar.bz2 spack-ccfe8aaf76f8fc294ea1bf0a9a1cd829c4166c5f.tar.xz spack-ccfe8aaf76f8fc294ea1bf0a9a1cd829c4166c5f.zip | |
portage: fix RelWithDebInfo build (#12944)
| -rw-r--r-- | var/spack/repos/builtin/packages/portage/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/portage/rel-with-deb-info.patch | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py index de77330983..91fc5fa4dc 100644 --- a/var/spack/repos/builtin/packages/portage/package.py +++ b/var/spack/repos/builtin/packages/portage/package.py @@ -27,6 +27,9 @@ class Portage(CMakePackage): # part of https://github.com/laristra/cinch/commit/f87f848269fac25aa5b8d0bd5d9c9b2d2d6fb0ad # fixed in version above 1.2.2 patch('p_lapacke_config.patch', when='@1.2.2') + # don't enable debug prints in RelWithDebInfo build + # fixed in version above 1.2.2 + patch('rel-with-deb-info.patch', when='@1.2.2') variant('mpi', default=True, description='Support MPI') diff --git a/var/spack/repos/builtin/packages/portage/rel-with-deb-info.patch b/var/spack/repos/builtin/packages/portage/rel-with-deb-info.patch new file mode 100644 index 0000000000..ca040cee3b --- /dev/null +++ b/var/spack/repos/builtin/packages/portage/rel-with-deb-info.patch @@ -0,0 +1,16 @@ +--- portage/cinch/cmake/globals.cmake.orig 2018-07-16 13:42:23.000000000 -0600 ++++ portage/cinch/cmake/globals.cmake 2019-07-09 16:27:56.021566000 -0600 +@@ -22,11 +22,9 @@ + "CMake build type <Debug|Release|RelWithDebInfo|MinSizeRel>" FORCE) + endif(NOT CMAKE_BUILD_TYPE) + +-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR +- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") ++if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + add_definitions(-DDEBUG) +-endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR +- "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") ++endif("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + + #------------------------------------------------------------------------------# + # Print useful information |