hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

portage: fix RelWithDebInfo build (#12944)

Browse source
This commit is contained in:
Christoph Junghans 2019-09-25 11:29:43 -06:00 committed by GitHub
parent e123058721
commit ccfe8aaf76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/portage/package.py
View file

@ -27,6 +27,9 @@ class Portage(CMakePackage):
# part of https://github.com/laristra/cinch/commit/f87f848269fac25aa5b8d0bd5d9c9b2d2d6fb0ad # part of https://github.com/laristra/cinch/commit/f87f848269fac25aa5b8d0bd5d9c9b2d2d6fb0ad
# fixed in version above 1.2.2 # fixed in version above 1.2.2
patch('p_lapacke_config.patch', when='@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') variant('mpi', default=True, description='Support MPI')

16
var/spack/repos/builtin/packages/portage/rel-with-deb-info.patch Normal file
View file

@ -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