diff options
Diffstat (limited to 'dev-util/boost-build/files')
10 files changed, 0 insertions, 191 deletions
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch deleted file mode 100644 index 8b88b43..0000000 --- a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/python.jam -+++ tools/python.jam -@@ -961,7 +961,7 @@ - # linux). - : $(usage-requirements) - <testing.launcher>$(set-PYTHONPATH) -- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib -+ <library-path>$(libraries) <library>python.lib - ; - } - diff --git a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch deleted file mode 100644 index b3bee03..0000000 --- a/dev-util/boost-build/files/boost-build-1.48.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/common.jam -+++ tools/common.jam -@@ -759,7 +759,15 @@ - switch $(f:G) - { - case <base> : -- result += $(name:B) ; -+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; -+ if $(matched) = boost_python || $(matched) = boost_mpi_python -+ { -+ result += $(name) ; -+ } -+ else -+ { -+ result += $(name:B) ; -+ } - - case <toolset> : - result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch deleted file mode 100644 index f5d6188..0000000 --- a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,26 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- tools/darwin.jam -+++ tools/darwin.jam -@@ -227,6 +227,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) -@@ -387,7 +390,8 @@ - support-ppc64 = ; - } - } -- switch $(arch) -+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either -+ switch $(donotaddarchpleaseXXXarch) - { - case combined : - { diff --git a/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch deleted file mode 100644 index 31f8db2..0000000 --- a/dev-util/boost-build/files/boost-build-1.50.0-fix-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/startup_v2.py.orig 2012-08-19 11:48:12.020600368 +0200 -+++ test/startup_v2.py 2012-08-19 11:48:28.564516623 +0200 -@@ -14,7 +14,7 @@ - return re.match(expected,actual,re.DOTALL) != None - - # Test the v1 startup behavior. --t = BoostBuild.Tester(match=match_re, boost_build_path='', pass_toolset=0) -+t = BoostBuild.Tester(match=match_re, boost_build_path='/invalid/location', pass_toolset=0) - - t.set_tree('startup') - diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch deleted file mode 100644 index f0a1561..0000000 --- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- engine/build.jam.orig 2012-08-19 09:47:23.916383518 +0200 -+++ engine/build.jam 2012-08-19 09:53:38.011554690 +0200 -@@ -3,7 +3,7 @@ - #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - # Clean env vars of any "extra" empty values. --for local v in ARGV CC CFLAGS LIBS -+for local v in ARGV CC CFLAGS LDFLAGS LIBS - { - local values ; - for local x in $($(v)) -@@ -179,10 +179,10 @@ - if ! $(CC) { CC = cc ; } - toolset cc $(CC) : "-o " : -D - : $(CFLAGS) -- [ opt --release : -s -O ] -+ [ opt --release : ] - [ opt --debug : -g ] - -I$(--python-include) -I$(--extra-include) -- : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## Comeau C/C++ 4.x - toolset como como : "-o " : -D - : --c -@@ -201,11 +201,11 @@ - ## MacOSX Darwin, using GCC 2.9.x, 3.x - toolset darwin cc : "-o " : -D - : -- [ opt --release : -Wl,-x -O3 -finline-functions ] -+ [ opt --release : -Wl,-x -finline-functions ] - [ opt --debug : -g -O0 -fno-inline -pg ] - [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ] - -I$(--python-include) -I$(--extra-include) -- : -L$(--python-lib[1]) -l$(--python-lib[2]) ; -+ : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ; - ## GCC 2.x, 3.x, 4.x - toolset gcc gcc : "-o " : -D - : -pedantic -fno-strict-aliasing ---- engine/build.sh.orig 2012-08-19 12:09:56.400780866 +0200 -+++ engine/build.sh 2012-08-19 12:10:49.728499203 +0200 -@@ -224,9 +224,9 @@ - cc) - if test -z "$CC" ; then CC=cc ; fi - BOOST_JAM_CC=$CC -- BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS" -- BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS" -- BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS" -+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS" -+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS" - ;; - - qcc) diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch deleted file mode 100644 index 08b40f3..0000000 --- a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch +++ /dev/null @@ -1,17 +0,0 @@ -Don't look for the framework path, we build Python the UNIX way for -Gentoo Prefix - ---- engine/build.jam -+++ engine/build.jam -@@ -82,11 +82,6 @@ - } - --python-lib = $(--python-lib[1]) ; - } -- else if $(OS) = MACOSX -- { -- --python-include = [ .path $(python-location) Headers ] ; -- --python-lib = $(python-location) Python ; -- } - else - { - --python-include = ; diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch deleted file mode 100644 index a44afb9..0000000 --- a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/startup_v2.py.orig 2013-08-27 12:23:10.520185408 +0400 -+++ test/startup_v2.py 2013-08-27 12:23:27.155186209 +0400 -@@ -50,7 +50,7 @@ - return re.match(expected, actual, re.DOTALL) != None - - --t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0) -+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0) - t.set_tree("startup") - check_for_existing_boost_build_jam(t) - diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch deleted file mode 100644 index bddcdac..0000000 --- a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/common.jam.orig 2013-08-27 12:13:56.865158748 +0400 -+++ tools/common.jam 2013-08-27 12:15:08.760162210 +0400 -@@ -763,7 +763,15 @@ - switch $(f:G) - { - case <base> : -- result += $(name:B) ; -+ local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ; -+ if $(matched) = boost_python || $(matched) = boost_mpi_python -+ { -+ result += $(name) ; -+ } -+ else -+ { -+ result += $(name:B) ; -+ } - - case <toolset> : - result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch deleted file mode 100644 index a521309..0000000 --- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/10122 - ---- engine/mem.h -+++ engine/mem.h -@@ -8,6 +8,8 @@ - #ifndef BJAM_MEM_H - #define BJAM_MEM_H - -+#include "jam.h" -+ - #ifdef OPT_BOEHM_GC - - /* Use Boehm GC memory allocator. */ diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam deleted file mode 100644 index 6afe526..0000000 --- a/dev-util/boost-build/files/site-config.jam +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# Define two new variants to be used when building boost (or separate boost-libs) -# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols -# values "none" which are not part of the official boost distribution. -# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! -variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ; -variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ; - |