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

boost: @1.77.0: need updated python_jam.patch for +python (#26363)

Browse Source 
One hunk changed and the new patch is refreshed using quilt.
This commit is contained in:
bernhardkaindl 2021-10-01 11:09:32 +02:00 committed by GitHub
parent 2d1ebbe0a2
commit 6ca42f0199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,8 +211,9 @@ def libs(self):
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')

42
var/spack/repos/builtin/packages/boost/python_jam-1_77.patch Normal file
View File

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