zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

snappy: patch and conflict for %nvhpc (#39063)

Browse Source
This commit is contained in:
Sergey Kosukhin 2023-08-17 08:44:38 +02:00 committed by GitHub
parent 90d0d0176c
commit c417a77a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/snappy/package.py
View File

@ -24,6 +24,21 @@ class Snappy(CMakePackage):
patch("link_gtest.patch", when="@:1.1.8") patch("link_gtest.patch", when="@:1.1.8")
# Version 1.1.9 makes use of an assembler feature that is not necessarily available when the
# __GNUC__ preprocessor macro is defined. Version 1.1.10 switched to the correct macro
# __GCC_ASM_FLAG_OUTPUTS__, which we also do for the version 1.1.9 by applying the patch from
# the upstream repo (see the commit message of the patch for more details).
patch(
"https://github.com/google/snappy/commit/8dd58a519f79f0742d4c68fbccb2aed2ddb651e8.patch?full_index=1",
sha256="debcdf182c046a30e9afea99ebbff280dd1fbb203e89abce6a05d3d17c587768",
when="@1.1.9",
)
# nvhpc@:22.3 does not know flag '-fno-rtti'
# nvhpc@:22.7 fails to compile snappy.cc: line 126: error: excessive recursion at instantiation
# of class "snappy::<unnamed>::make_index_sequence<
conflicts("@1.1.9:", when="%nvhpc@:22.7")
def cmake_args(self): def cmake_args(self):
return [ return [
self.define("CMAKE_INSTALL_LIBDIR", self.prefix.lib), self.define("CMAKE_INSTALL_LIBDIR", self.prefix.lib),