diff options
| author | ketsubouchi <kenta.tsubouchi@hac-inc.co.jp> | 2020-12-27 21:38:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 13:38:54 +0100 |
| commit | 0a241b241429f77b2f3ad9e3735d2cb4050686b9 (patch) | |
| tree | 22278d40ca24ebb3bce3905c4bb5eb1e7c76c338 | |
| parent | 2cda9ea7fd760f74e278b49e1282c457f8ac149b (diff) | |
| download | spack-0a241b241429f77b2f3ad9e3735d2cb4050686b9.tar.gz spack-0a241b241429f77b2f3ad9e3735d2cb4050686b9.tar.bz2 spack-0a241b241429f77b2f3ad9e3735d2cb4050686b9.tar.xz spack-0a241b241429f77b2f3ad9e3735d2cb4050686b9.zip | |
boost: backport python3 import fix (#20301)
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/boost_218.patch | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/boost_218.patch b/var/spack/repos/builtin/packages/boost/boost_218.patch new file mode 100644 index 0000000000..ab4d9085f5 --- /dev/null +++ b/var/spack/repos/builtin/packages/boost/boost_218.patch @@ -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 + diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 858e929b67..de4791a93f 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -256,6 +256,10 @@ class Boost(Package): # See https://github.com/boostorg/build/pull/154 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): # Disable SSSE3 and AVX2 when using the NVIDIA compiler if self.spec.satisfies('%nvhpc'): |