sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 09:19:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix on 6.x -- does not hardcode gcc version in the Makefile

Browse source 
Submitted by:	maintainer
This commit is contained in:
Pav Lucistnik 2009-08-03 21:04:08 +00:00
parent 9fa1c345c9
commit 092aaa3d41
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238855
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
devel/boost-python-libs/Makefile
View file

@ -59,15 +59,20 @@ do-build:
# Remove non-python headers
cd ${WRKSRC} && \
${FIND} boost -not -path '*python*' -delete
${FIND} boost -not -path '*boost/python*' -delete
do-install:
# Install libraries
${INSTALL_DATA} ${WRKSRC}/bin.v2/libs/python/build/gcc-4.2.1/release/link-static/threading-multi/libboost_python.a ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/bin.v2/libs/python/build/gcc-4.2.1/release/threading-multi/libboost_python.so.${PORTVERSION} ${PREFIX}/lib/libboost_python.so.${BOOST_SHARED_LIB_VER}
${FIND} ${WRKSRC}/bin.v2/libs/python -type f -name "*.a"\
-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
${FIND} -E ${WRKSRC}/bin.v2/libs/python -type f \
-regex '.*so' \
-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
# Create symlink for shared library
cd ${PREFIX}/lib/ && \
${MV} "libboost_python.so" "libboost_python.so.${BOOST_SHARED_LIB_VER}" && \
${LN} -fs "libboost_python.so.${BOOST_SHARED_LIB_VER}" "libboost_python.so"
# Install headers

20
devel/boost-python-libs/files/patch-Jamroot Normal file
View file

@ -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) ;

25
devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam
View file

@ -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 :