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

boost: backport python3 import fix (#20301)

Browse Source
This commit is contained in:
ketsubouchi 2020-12-27 21:38:54 +09:00 committed by GitHub
parent 2cda9ea7fd
commit 0a241b2414
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/boost/boost_218.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/libs/python/src/numpy/numpy.cpp
+++ b/libs/python/src/numpy/numpy.cpp
@@ -19,6 +19,7 @@ static void wrap_import_array()
static void * wrap_import_array()
{
import_array();
+ return NULL;
}
#endif

4
var/spack/repos/builtin/packages/boost/package.py
View File

@ -256,6 +256,10 @@ def libs(self):
# See https://github.com/boostorg/build/pull/154 # See https://github.com/boostorg/build/pull/154
patch('boost_154.patch', when='@:1.63.99') patch('boost_154.patch', when='@:1.63.99')
# Backport Python3 import problem
# See https://github.com/boostorg/python/pull/218
patch('boost_218.patch', when='@:1.67.99')
def patch(self): def patch(self):
# Disable SSSE3 and AVX2 when using the NVIDIA compiler # Disable SSSE3 and AVX2 when using the NVIDIA compiler
if self.spec.satisfies('%nvhpc'): if self.spec.satisfies('%nvhpc'):