diff options
Diffstat (limited to 'devel/boost-python-libs/files')
| -rw-r--r-- | devel/boost-python-libs/files/patch-Jamroot | 31 | ||||
| -rw-r--r-- | devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam | 28 |
2 files changed, 25 insertions, 34 deletions
diff --git a/devel/boost-python-libs/files/patch-Jamroot b/devel/boost-python-libs/files/patch-Jamroot index 3b8f07c6ec50..7903f6daf682 100644 --- a/devel/boost-python-libs/files/patch-Jamroot +++ b/devel/boost-python-libs/files/patch-Jamroot @@ -1,20 +1,11 @@ ---- Jamroot.orig-orig 2009-07-06 20:50:54.000000000 +0400 -+++ Jamroot 2009-07-06 20:52:21.000000000 +0400 -@@ -333,7 +333,7 @@ - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && -+ ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; -@@ -356,7 +356,7 @@ - # suffixes either. Pgi compilers can not accept library with version - # suffix. - if $(type) = SHARED_LIB && -- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && -+ ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) && - ! ( [ $(property-set).get <toolset> ] in pgi ) ) - { - result = $(result).$(BOOST_VERSION) ; +--- Jamroot.orig 2009-09-23 16:35:49.000000000 +0400 ++++ Jamroot 2009-09-23 16:36:49.000000000 +0400 +@@ -384,7 +384,7 @@ + # suffixes either. Pgi compilers can not accept library with version + # suffix. + if $(type) = SHARED_LIB && +- ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) && ++ ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix freebsd ) && + ! ( [ $(property-set).get <toolset> ] in pgi ) ) + { + result = $(result).$(BOOST_VERSION) ; diff --git a/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam b/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam index 68683f173aee..cc306b204292 100644 --- a/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam +++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam @@ -1,17 +1,17 @@ ---- tools/build/v2/tools/common.jam.orig Thu Oct 16 12:42:03 2008 -+++ tools/build/v2/tools/common.jam Tue Nov 11 23:43:27 2008 -@@ -760,14 +760,6 @@ +--- tools/build/v2/tools/common.jam.orig 2009-09-23 16:39:31.000000000 +0400 ++++ tools/build/v2/tools/common.jam 2009-09-23 16:39:33.000000000 +0400 +@@ -765,14 +765,6 @@ result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : - $(property-set) ] ] ; - -- case <threading> : + $(property-set) ] ] ; + +- case <threading> : - result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type) -- : $(property-set) ] ] ; -- -- case <runtime> : +- : $(property-set) ] ] ; +- +- case <runtime> : - result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) : -- $(property-set) ] ] ; -- - case <version:*> : - local key = [ MATCH <version:(.*)> : $(f:G) ] ; - local version = [ $(property-set).get <$(key)> ] ; +- $(property-set) ] ] ; +- + case <qt> : + result += [ join-tag $(f:G=) : [ qt-tag $(name) : $(type) : + $(property-set) ] ] ; |