Index: head/devel/boost-all/compiled.mk =================================================================== --- head/devel/boost-all/compiled.mk (revision 398059) +++ head/devel/boost-all/compiled.mk (revision 398060) @@ -1,54 +1,45 @@ USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message BJAM= bjam USES+= compiler:c++11-lang PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTVERSION} COMPAT_LIB_VER=5 PKG_MESSAGE_FILE_THREADS= ${PORTSDIR}/devel/boost-all/pkg-message.threads PKG_MESSAGE_FILE_PYTHON= ${PORTSDIR}/devel/boost-all/pkg-message.python -.include - BJAM_ARGS= --layout=system \ --prefix=${PREFIX} \ # Our compiler-flags will be added AFTER those set by bjam. We remove # the optimization level, because Boost sets it itself (to -O3 in case # of gcc/g++): BJAM_ARGS+= cxxflags="${CXXFLAGS:N-O*}" cflags="${CFLAGS:N-O*}" BOOST_TOOLSET= ${CHOSEN_COMPILER_TYPE} BJAM_ARGS+= --toolset=${BOOST_TOOLSET} \ ${_MAKE_JOBS} -.if ${PORT_OPTIONS:MVERBOSE_BUILD} -BJAM_ARGS+= -d2 -.endif +VERBOSE_BUILD_VARS= BJAM_ARGS+=-d2 -.if ${PORT_OPTIONS:MDEBUG} -BJAM_ARGS+= debug -.else -BJAM_ARGS+= release -.endif +DEBUG_VARS= BJAM_ARGS+=debug +DEBUG_VARS_OFF= BJAM_ARGS+=release BJAM_ARGS+= threading=multi \ link=shared,static BJAM_ARGS+= optimization=speed -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -BJAM_ARGS+= inlining=full -.endif +OPTIMIZED_CFLAGS_VARS= BJAM_ARGS+=inlining=full # ccache build fails when using precompiled headers, on a cached build. .if defined(WITH_CCACHE_BUILD) BJAM_ARGS+= pch=off .endif post-patch: .if defined(USE_BINUTILS) @${ECHO} "using ${BOOST_TOOLSET} : : ${CXX} : -B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/v2/user-config.jam .else @${ECHO} "using ${BOOST_TOOLSET} : : ${CXX} ;" >> ${WRKSRC}/tools/build/v2/user-config.jam .endif Index: head/devel/boost-libs/Makefile =================================================================== --- head/devel/boost-libs/Makefile (revision 398059) +++ head/devel/boost-libs/Makefile (revision 398060) @@ -1,67 +1,63 @@ # Created by: Alexander Churanov # $FreeBSD$ PORTNAME= boost-libs COMMENT= Free portable C++ libraries (without Boost.Python) PORTREVISION= 8 BUILD_DEPENDS+= bjam:${PORTSDIR}/devel/boost-jam OPTIONS_DEFINE= VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS OPTIONS_DEFAULT= ICU VERBOSE_BUILD_DESC= Show compiler messages ICU_DESC= Boost.Regex with ICU unicode support ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu +ICU_VARS= BJAM_ARGS+=-sICU_PATH=${LOCALBASE} ICU_USES_OFF= iconv +ICU_VARS_OFF= BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} .include "${.CURDIR}/../boost-all/common.mk" .include "${.CURDIR}/../boost-all/compiled.mk" BJAM_ARGS+= --without-python .if defined(X_BUILD_FOR) BJAM_ARGS+= --without-context --without-coroutine \ --without-locale --without-log PLIST_SUB+= COROUTINE="@comment " CONTEXT="@comment " \ LOCALE="@comment " LOG="@comment " .else PLIST_SUB+= COROUTINE="" CONTEXT="" LOCALE="" LOG="" .endif -.if ${PORT_OPTIONS:MICU} -BJAM_ARGS+= -sICU_PATH=${LOCALBASE} -.else -BJAM_ARGS+= -sICONV_PATH=${ICONV_PREFIX} -.endif - do-build: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage #Compatibility layer to avoid rebuilding everything this time @cd ${WRKSRC}/stage/lib && \ ( for l in lib*.so.*; do ${LN} -sf $${l} $${l%.${PORTVERSION}}.5; done ) do-install: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${BJAM} --prefix=${STAGEDIR}${PREFIX} ${BJAM_ARGS} install # For some reasons BJAM forget about the links @cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX} # display pkg-message post-install: @${TOUCH} ${PKGMESSAGE} @${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} -.include +.include Index: head/devel/boost-python-libs/Makefile =================================================================== --- head/devel/boost-python-libs/Makefile (revision 398059) +++ head/devel/boost-python-libs/Makefile (revision 398060) @@ -1,52 +1,52 @@ # Created by: Alexander Churanov # $FreeBSD$ PORTNAME= boost-python-libs COMMENT= Framework for interfacing Python and C++ USES+= python OPTIONS_DEFINE= VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS VERBOSE_BUILD_DESC= Show compiler messages .include "${.CURDIR}/../boost-all/common.mk" .include "${.CURDIR}/../boost-all/compiled.mk" MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}"\ PYTHON_VERSION="${PYTHON_VERSION}"\ PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\ PYTHON_LIB_PATH="${PYTHON_LIBDIR}" LIB_DEPENDS+= libboost_thread.so:${PORTSDIR}/devel/boost-libs BUILD_DEPENDS+= ${BJAM}:${PORTSDIR}/devel/boost-jam do-build: @${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/v2/site-config.jam # build the library @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} --with-python stage # do not break compat yet @cd ${WRKSRC}/stage/lib && \ ( for l in lib*.so.*; do ${LN} -sf $${l} $${l%.${PORTVERSION}}.5; done ) do-install: @cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p libboost* ${STAGEDIR}${PREFIX}/lib # For some reasons BJAM forget about the links @cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX} 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|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} -.include +.include