summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernhardkaindl <43588962+bernhardkaindl@users.noreply.github.com>2021-10-01 11:09:32 +0200
committerGitHub <noreply@github.com>2021-10-01 11:09:32 +0200
commit6ca42f0199d3b103a518599e9cc27ef0075b1f94 (patch)
tree5c0502b75c75cc2c6e2e4dcadcc7487514de2a57
parent2d1ebbe0a2b0ebf33cfdcfad7324572ef95f992b (diff)
downloadspack-6ca42f0199d3b103a518599e9cc27ef0075b1f94.tar.gz
spack-6ca42f0199d3b103a518599e9cc27ef0075b1f94.tar.bz2
spack-6ca42f0199d3b103a518599e9cc27ef0075b1f94.tar.xz
spack-6ca42f0199d3b103a518599e9cc27ef0075b1f94.zip
boost: @1.77.0: need updated python_jam.patch for +python (#26363)
One hunk changed and the new patch is refreshed using quilt.
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py5
-rw-r--r--var/spack/repos/builtin/packages/boost/python_jam-1_77.patch42
2 files changed, 45 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index dba864f4c4..cfc63a508f 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -211,8 +211,9 @@ class Boost(Package):
patch('boost_11856.patch', when='@1.60.0%gcc@4.4.7')
# Patch fix from https://svn.boost.org/trac/boost/ticket/11120
- patch('python_jam.patch', when='@1.56.0: ^python@3:')
- patch('python_jam_pre156.patch', when='@:1.55.0 ^python@3:')
+ patch('python_jam-1_77.patch', when='@1.77: ^python@3:')
+ patch('python_jam.patch', when='@1.56:1.76 ^python@3:')
+ patch('python_jam_pre156.patch', when='@:1.55.0 ^python@3:')
# Patch fix for IBM XL compiler
patch('xl_1_62_0_le.patch', when='@1.62.0%xl_r')
diff --git a/var/spack/repos/builtin/packages/boost/python_jam-1_77.patch b/var/spack/repos/builtin/packages/boost/python_jam-1_77.patch
new file mode 100644
index 0000000000..931fd84a34
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/python_jam-1_77.patch
@@ -0,0 +1,42 @@
+Index: spack-src/tools/build/src/tools/python.jam
+===================================================================
+--- spack-src/tools/build/src/tools/python.jam
++++ spack-src/tools/build/src/tools/python.jam
+@@ -501,6 +501,10 @@ local rule probe ( python-cmd )
+ sys.$(s) = [ SUBST $(output) "\\<$(s)=([^$(nl)]+)" $1 ] ;
+ }
+ }
++ # Try to get python abiflags
++ full-cmd = $(python-cmd)" -c \"from sys import abiflags; print(abiflags, end='')\"" ;
++
++ sys.abiflags = [ SHELL $(full-cmd) ] ;
+ return $(output) ;
+ }
+ }
+@@ -510,7 +514,7 @@ local rule probe ( python-cmd )
+ # have a value based on the information given.
+ #
+ local rule compute-default-paths ( target-os : version ? : prefix ? :
+- exec-prefix ? )
++ exec-prefix ? : abiflags ? )
+ {
+ exec-prefix ?= $(prefix) ;
+
+@@ -547,7 +551,7 @@ local rule compute-default-paths ( targe
+ }
+ else
+ {
+- local default-include-path = $(prefix)/include/python$(version) ;
++ local default-include-path = $(prefix)/include/python$(version)$(abiflags) ;
+ if ! [ path.exists $(default-include-path) ] && [ path.exists $(default-include-path)m ]
+ {
+ default-include-path = $(default-include-path)m ;
+@@ -798,7 +802,7 @@ local rule configure ( version ? : cmd-o
+ exec-prefix = $(sys.exec_prefix) ;
+
+ compute-default-paths $(target-os) : $(sys.version) :
+- $(sys.prefix) : $(sys.exec_prefix) ;
++ $(sys.prefix) : $(sys.exec_prefix) : $(sys.abiflags) ;
+
+ version = $(sys.version) ;
+ interpreter-cmd ?= $(cmd) ;