diff options
Diffstat (limited to 'devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam')
| -rw-r--r-- | devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam | 54 |
1 files changed, 54 insertions, 0 deletions
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 : |
