diff options
Diffstat (limited to 'devel/boost-python-libs/files')
4 files changed, 93 insertions, 0 deletions
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 new file mode 100644 index 000000000000..68683f173aee --- /dev/null +++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam @@ -0,0 +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 @@ + result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) : + $(property-set) ] ] ; + +- case <threading> : +- result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type) +- : $(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)> ] ; diff --git a/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam b/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam new file mode 100644 index 000000000000..f370c8237dae --- /dev/null +++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam @@ -0,0 +1,54 @@ +--- tools/build/v2/tools/gcc.jam.orig Thu Oct 16 12:42:03 2008 ++++ tools/build/v2/tools/gcc.jam Tue Nov 11 23:48:37 2008 +@@ -88,7 +88,7 @@ + { + # Information about the gcc command... + # The command. +- local command = [ common.get-invocation-command gcc : g++ : $(command) ] ; ++ local command = [ common.get-invocation-command gcc : %%CXX%% : $(command) ] ; + # The root directory of the tool install. + local root = [ feature.get-values <root> : $(options) ] ; + # The bin directory where to find the command to execute. +@@ -292,7 +292,7 @@ + + # Declare flags and action for compilation. + toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; +-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ; ++toolset.flags gcc.compile OPTIONS <optimization>speed : %%CXXFLAGS%% ; + toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; + + toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; +@@ -349,15 +349,6 @@ + } + } + +-# FIXME: this should not use os.name. +-if [ os.name ] != NT && [ os.name ] != OSF && [ os.name ] != HPUX && [ os.name ] != AIX +-{ +- # OSF does have an option called -soname but it does not seem to work as +- # expected, therefore it has been disabled. +- HAVE_SONAME = "" ; +- SONAME_OPTION = -h ; +-} +- + + toolset.flags gcc.compile USER_OPTIONS <cflags> ; + toolset.flags gcc.compile.c++ USER_OPTIONS <cxxflags> ; +@@ -793,7 +784,7 @@ + # Differs from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) ++ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + rule setup-threading ( targets * : sources * : properties * ) +@@ -811,7 +811,7 @@ + } + case *bsd : + { +- option = -pthread ; ++ option = %%PTHREAD_LIBS%% %%PTHREAD_CFLAGS%% ; + # There is no -lrt on BSD. + } + case sgi : diff --git a/devel/boost-python-libs/files/patch-tools_build_v2_tools_python.jam b/devel/boost-python-libs/files/patch-tools_build_v2_tools_python.jam new file mode 100644 index 000000000000..bf2212b3d520 --- /dev/null +++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_python.jam @@ -0,0 +1,11 @@ +--- tools/build/v2/tools/python.jam.orig Thu Oct 16 12:42:03 2008 ++++ tools/build/v2/tools/python.jam Tue Nov 11 23:50:21 2008 +@@ -650,7 +650,7 @@ + case windows : return ; + + case hpux : return <library>rt ; +- case *bsd : return <library>pthread <toolset>gcc:<library>util ; ++ case *bsd : return <library>%%PTHREAD_LIBS%% <toolset>gcc:<library>util ; + + case aix : return <library>pthread <library>dl ; + diff --git a/devel/boost-python-libs/files/patch-tools_jam_src_build.jam b/devel/boost-python-libs/files/patch-tools_jam_src_build.jam new file mode 100644 index 000000000000..413fef332db7 --- /dev/null +++ b/devel/boost-python-libs/files/patch-tools_jam_src_build.jam @@ -0,0 +1,11 @@ +--- tools/jam/src/build.jam.orig Tue Jul 29 15:43:31 2008 ++++ tools/jam/src/build.jam Tue Nov 11 23:52:09 2008 +@@ -176,7 +176,7 @@ + ## GCC 2.x, 3.x, 4.x + toolset gcc gcc : "-o " : -D + : -pedantic -fno-strict-aliasing +- [ opt --release : [ opt --symbols : -g : -s ] -O3 ] ++ [ opt --release : [ opt --symbols : -g : -s ] -O3 -fno-strict-aliasing ] + [ opt --debug : -g -O0 -fno-inline ] + -I$(--python-include) -I$(--extra-include) -Wno-long-long + : -L$(--python-lib[1]) -l$(--python-lib[2]) ; |