Date: Wed, 23 Nov 2016 12:43:49 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426906 - in head/devel: boost-all boost-jam boost-libs boost-python-libs Message-ID: <201611231243.uANChn55027210@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Nov 23 12:43:49 2016 New Revision: 426906 URL: https://svnweb.freebsd.org/changeset/ports/426906 Log: devel/boost-*: better integrate with Mk/* PR: 199601 Submitted by: bapt (based on) Exp-run by: antoine Modified: head/devel/boost-all/compiled.mk head/devel/boost-jam/Makefile (contents, props changed) head/devel/boost-libs/Makefile (contents, props changed) head/devel/boost-python-libs/Makefile (contents, props changed) Modified: head/devel/boost-all/compiled.mk ============================================================================== --- head/devel/boost-all/compiled.mk Wed Nov 23 12:43:36 2016 (r426905) +++ head/devel/boost-all/compiled.mk Wed Nov 23 12:43:49 2016 (r426906) @@ -1,6 +1,9 @@ USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message -BJAM= bjam +MAKE_CMD= bjam +MAKEFILE= # +MAKE_FLAGS= # +ALL_TARGET= stage USES+= compiler:c++11-lang PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTVERSION} @@ -8,28 +11,26 @@ PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTV PKG_MESSAGE_FILE_THREADS= ${PORTSDIR}/devel/boost-all/pkg-message.threads PKG_MESSAGE_FILE_PYTHON= ${PORTSDIR}/devel/boost-all/pkg-message.python -BJAM_ARGS= --layout=system \ +MAKE_ARGS= --layout=system \ --prefix=${PREFIX} \ -d2 # 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*}" +MAKE_ARGS+= cxxflags="${CXXFLAGS:N-O*}" cflags="${CFLAGS:N-O*}" -BOOST_TOOLSET= ${CHOSEN_COMPILER_TYPE} - -BJAM_ARGS+= --toolset=${BOOST_TOOLSET} \ +MAKE_ARGS+= --toolset=${CHOSEN_COMPILER_TYPE} \ ${_MAKE_JOBS} -DEBUG_VARS= BJAM_ARGS+=debug -DEBUG_VARS_OFF= BJAM_ARGS+=release +DEBUG_MAKE_ARGS= debug +DEBUG_MAKE_ARGS_OFF= release -BJAM_ARGS+= threading=multi \ +MAKE_ARGS+= threading=multi \ link=shared,static -BJAM_ARGS+= optimization=speed -OPTIMIZED_CFLAGS_VARS= BJAM_ARGS+=inlining=full +MAKE_ARGS+= optimization=speed +OPTIMIZED_CFLAGS_MAKE_ARGS= inlining=full # ccache build fails when using precompiled headers, on a cached build. .if defined(WITH_CCACHE_BUILD) @@ -38,7 +39,7 @@ BJAM_ARGS+= pch=off post-patch: .if defined(USE_BINUTILS) - @${ECHO} "using ${BOOST_TOOLSET} : : ${CXX} : <linkflags>-B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/v2/user-config.jam + @${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} : <linkflags>-B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/v2/user-config.jam .else - @${ECHO} "using ${BOOST_TOOLSET} : : ${CXX} ;" >> ${WRKSRC}/tools/build/v2/user-config.jam + @${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} ;" >> ${WRKSRC}/tools/build/v2/user-config.jam .endif Modified: head/devel/boost-jam/Makefile ============================================================================== --- head/devel/boost-jam/Makefile Wed Nov 23 12:43:36 2016 (r426905) +++ head/devel/boost-jam/Makefile Wed Nov 23 12:43:49 2016 (r426906) @@ -6,17 +6,20 @@ COMMENT= Build tool from the boost.org PLIST_FILES= bin/bjam -EXTRACT_AFTER_ARGS= ${DISTNAME}/tools/build/v2/engine +EXTRACT_AFTER_ARGS= ${DISTNAME}/${WRKSRC_SUBDIR} +MAKE_CMD= ./build.sh +ALL_TARGET= cc +MAKE_FLAGS= # +_MAKE_JOBS= # +MAKEFILE= # -.include "${.CURDIR}/../boost-all/common.mk" +WRKSRC_SUBDIR= tools/build/v2/engine -do-build: - cd ${WRKSRC}/tools/build/v2/engine && \ - ${MAKE_ENV} ./build.sh cc +.include "${.CURDIR}/../boost-all/common.mk" do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tools/build/v2/engine/bin.*/bjam \ + ${INSTALL_PROGRAM} ${WRKSRC}/bin.*/bjam \ ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/devel/boost-libs/Makefile ============================================================================== --- head/devel/boost-libs/Makefile Wed Nov 23 12:43:36 2016 (r426905) +++ head/devel/boost-libs/Makefile Wed Nov 23 12:43:49 2016 (r426906) @@ -16,27 +16,24 @@ ICONV_DESC= Boost.Locale with iconv enc ICU_DESC= Boost.Regex/Locale with ICU unicode support ICONV_USES= iconv -ICONV_VARS= BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} -ICONV_VARS_OFF= BJAM_ARGS+=boost.locale.iconv=off +ICONV_MAKE_ARGS= -sICONV_PATH=${ICONV_PREFIX} +ICONV_MAKE_ARGS_OFF= boost.locale.iconv=off ICU_LIB_DEPENDS= libicuuc.so:devel/icu -ICU_VARS= BJAM_ARGS+=-sICU_PATH=${LOCALBASE} -ICU_VARS_OFF= BJAM_ARGS+=boost.locale.icu=off +ICU_MAKE_ARGS= -sICU_PATH=${LOCALBASE} +ICU_MAKE_ARGS_OFF= boost.locale.icu=off .include "${.CURDIR}/../boost-all/common.mk" .include "${.CURDIR}/../boost-all/compiled.mk" -BJAM_ARGS+= --without-python - BROKEN_aarch64= Fails to compile: multiple instances of error: platform not supported -do-build: - @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage +MAKE_ARGS+= --without-python +ALL_TARGET= stage do-install: - @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${BJAM} --prefix=${STAGEDIR}${PREFIX} ${BJAM_ARGS} install + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ + ${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET} # For some reasons BJAM forget about the links @cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX} Modified: head/devel/boost-python-libs/Makefile ============================================================================== --- head/devel/boost-python-libs/Makefile Wed Nov 23 12:43:36 2016 (r426905) +++ head/devel/boost-python-libs/Makefile Wed Nov 23 12:43:49 2016 (r426906) @@ -18,14 +18,13 @@ MAKE_ENV+= PYTHON_ROOT="${LOCALBASE}"\ PYTHON_LIB_PATH="${PYTHON_LIBDIR}" LIB_DEPENDS+= libboost_thread.so:devel/boost-libs +MAKE_ARGS+= --with-python +ALL_TARGET= stage -BUILD_DEPENDS+= ${BJAM}:devel/boost-jam +BUILD_DEPENDS+= bjam:devel/boost-jam -do-build: +pre-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-install: @cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p libboost* ${STAGEDIR}${PREFIX}/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611231243.uANChn55027210>