diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-08-03 21:04:08 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-08-03 21:04:08 +0000 |
| commit | 092aaa3d410cc557027df202d35d9b053150ec2a (patch) | |
| tree | 82011df0d5f6fc383bfd19f4be32ed5e96c38cf0 /devel/boost-python-libs/files | |
| parent | Deprecate this port, the sheep server is gone, there is no tarball for (diff) | |
- Fix on 6.x -- does not hardcode gcc version in the Makefile
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=238855
Diffstat (limited to 'devel/boost-python-libs/files')
| -rw-r--r-- | devel/boost-python-libs/files/patch-Jamroot | 20 | ||||
| -rw-r--r-- | devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam | 25 |
2 files changed, 20 insertions, 25 deletions
diff --git a/devel/boost-python-libs/files/patch-Jamroot b/devel/boost-python-libs/files/patch-Jamroot new file mode 100644 index 000000000000..3b8f07c6ec50 --- /dev/null +++ b/devel/boost-python-libs/files/patch-Jamroot @@ -0,0 +1,20 @@ +--- 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) ; 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 index f370c8237dae..9daa31f24d9c 100644 --- 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 @@ -18,31 +18,6 @@ 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 : |