hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes patch paths for earlier boost versions (#3712)

Browse source 
* Fixes patch paths for earlier boost versions

The directory structure of boost changed at version 1.56.0, so the patch
being used for python support did not work on earlier versions. This
adds another patch that matches earlier versions.

* Removes commented out code
This commit is contained in:
Josh Asplund 2017-04-05 14:26:22 -07:00 committed by Adam J. Stewart
parent 745e2ce52f
commit 048b6fc454
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/boost/package.py
View file

@ -131,7 +131,8 @@ 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='^python@3:')
patch('python_jam.patch', when='@1.56.0: ^python@3:')
patch('python_jam_pre156.patch', when='@:1.55.0 ^python@3:')
# Patch fix from https://svn.boost.org/trac/boost/ticket/10125
patch('boost_10125.patch', when='@1.55.0%gcc@5.0:5.9')

42
var/spack/repos/builtin/packages/boost/python_jam_pre156.patch Normal file
View file

@ -0,0 +1,42 @@
diff --git a/tools/build/v2/tools/python.jam b/tools/build/v2/tools/python.jam
index 90377ea..123f66a 100644
--- a/tools/build/v2/tools/python.jam
+++ b/tools/build/v2/tools/python.jam
@@ -493,6 +493,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) ;
}
}
@@ -502,7 +506,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) ;
@@ -539,7 +543,7 @@ local rule compute-default-paths ( target-os : version ? : prefix ? :
}
else
{
- includes ?= $(prefix)/include/python$(version) ;
+ includes ?= $(prefix)/include/python$(version)$(abiflags) ;
local lib = $(exec-prefix)/lib ;
libraries ?= $(lib)/python$(version)/config $(lib) ;
@@ -783,7 +787,7 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
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) ;