Index: head/devel/boost-python-libs/Makefile =================================================================== --- head/devel/boost-python-libs/Makefile (revision 238854) +++ head/devel/boost-python-libs/Makefile (revision 238855) @@ -1,109 +1,114 @@ # Ports collection makefile for: boost-python-libs # Date Created: 18 March 2009 # Whom: Alexander Churanov # # $FreeBSD$ # PORTNAME= boost-python-libs COMMENT= Framework for interfacing Python and C++ USE_BZIP2= yes USE_PYTHON= 2.4+ OPTIONS= VERBOSE_BUILD "Show compiler messages" off \ DEBUG "Build debugging symbols" off \ OPTIMIZED_CFLAGS "Enable -O3 optimization" off .include .include "${PORTSDIR}/devel/boost-all/common.mk" .include "${PORTSDIR}/devel/boost-all/sites.mk" .include "${PORTSDIR}/devel/boost-all/compiled.mk" MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}"\ PYTHON_VERSION="${PYTHON_VERSION}"\ PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\ PYTHON_LIB_PATH="${PYTHON_LIBDIR}" RUN_DEPENDS+= ${PREFIX}/lib/libboost_thread.so.${BOOST_SHARED_LIB_VER}:${PORTSDIR}/devel/boost-libs RUN_DEPENDS+= gccxml:${PORTSDIR}/devel/gccxml \ ${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree BUILD_DEPENDS+= ${BJAM}:${PORTSDIR}/devel/boost-jam BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree ESCAPED_PREFIX != echo ${PREFIX} | sed 's/\//\\\//g' RELATIVE_PYTHON_SITELIBDIR != echo ${PYTHON_SITELIBDIR} | sed "s/${ESCAPED_PREFIX}\///" PLIST_SUB+= PYTHON_SITELIBDIR=${RELATIVE_PYTHON_SITELIBDIR} PLIST_SUB+= PYTHON_VERSION=${PYTHON_VERSION:C/python//1} post-patch: customize-boost-build post-configure: # Configure pyste, the Boost.Python code generator @cd ${BUILD_WRKSRC}/libs/python/pyste/install && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \ config ${PYDISTUTILS_CONFIGUREARGS} do-build: # build the library cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX}\ --toolset=${BOOST_TOOLS} --with-python # Build pyste, the Boost.Python code generator cd ${BUILD_WRKSRC}/libs/python/pyste/install && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \ build ${PYDISTUTILS_BUILDARGS} # 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 cd ${WRKSRC} && \ ${FIND} boost -type d -a \! -name "*.orig"\ -exec ${MKDIR} ${PREFIX}/include/\{\} \; cd ${WRKSRC} && \ ${FIND} boost -type f -a \! -name "*.orig"\ -exec ${INSTALL_DATA} \{\} ${PREFIX}/include/\{\} \; # Install pyste, the Boost.Python code generator cd ${WRKSRC}/libs/python/pyste/install && \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \ install ${PYDISTUTILS_INSTALLARGS} post-install: # display pkg-message @${TOUCH} ${PKGMESSAGE} @${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${CAT} ${PKG_MESSAGE_FILE_PYTHON} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} @if [ -s ${PKGMESSAGE} ]; then \ ${ECHO_CMD} ; \ ${ECHO_CMD} "===============================================================================" ; \ ${ECHO_CMD} ; \ ${CAT} ${PKGMESSAGE}; \ ${ECHO_CMD} "===============================================================================" ; \ ${ECHO_CMD} ; \ fi .include Property changes on: head/devel/boost-python-libs/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/boost-python-libs/files/patch-Jamroot =================================================================== --- head/devel/boost-python-libs/files/patch-Jamroot (nonexistent) +++ head/devel/boost-python-libs/files/patch-Jamroot (revision 238855) @@ -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 ] in windows cygwin darwin aix ) && ++ ( ! ( [ $(property-set).get ] in windows freebsd cygwin darwin aix ) && + ! ( [ $(property-set).get ] 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 ] in windows cygwin darwin aix ) && ++ ( ! ( [ $(property-set).get ] in windows freebsd cygwin darwin aix ) && + ! ( [ $(property-set).get ] in pgi ) ) + { + result = $(result).$(BOOST_VERSION) ; Property changes on: head/devel/boost-python-libs/files/patch-Jamroot ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam =================================================================== --- head/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam (revision 238854) +++ head/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam (revision 238855) @@ -1,54 +1,29 @@ --- 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 : $(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 off : -O0 ; -toolset.flags gcc.compile OPTIONS speed : -O3 ; +toolset.flags gcc.compile OPTIONS speed : %%CXXFLAGS%% ; toolset.flags gcc.compile OPTIONS space : -Os ; toolset.flags gcc.compile OPTIONS 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 ; - toolset.flags gcc.compile.c++ USER_OPTIONS ; -@@ -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 : Property changes on: head/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property