svn commit: r398060 - in head/devel: boost-all boost-libs boost-python-libs
Jan Beich
jbeich at FreeBSD.org
Sun Sep 27 21:58:33 UTC 2015
Author: jbeich
Date: Sun Sep 27 21:58:31 2015
New Revision: 398060
URL: https://svnweb.freebsd.org/changeset/ports/398060
Log:
devel/boost-*: convert to more option helpers
Approved by: office (truckman, bapt) (maintainer)
Differential Revision: https://reviews.freebsd.org/D3739
Modified:
head/devel/boost-all/compiled.mk (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 Sun Sep 27 21:58:17 2015 (r398059)
+++ head/devel/boost-all/compiled.mk Sun Sep 27 21:58:31 2015 (r398060)
@@ -8,8 +8,6 @@ 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
-.include <bsd.port.pre.mk>
-
BJAM_ARGS= --layout=system \
--prefix=${PREFIX} \
@@ -23,23 +21,16 @@ 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)
Modified: head/devel/boost-libs/Makefile
==============================================================================
--- head/devel/boost-libs/Makefile Sun Sep 27 21:58:17 2015 (r398059)
+++ head/devel/boost-libs/Makefile Sun Sep 27 21:58:31 2015 (r398060)
@@ -14,7 +14,9 @@ VERBOSE_BUILD_DESC= Show compiler messag
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"
@@ -30,12 +32,6 @@ PLIST_SUB+= COROUTINE="@comment " CONTEX
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
@@ -64,4 +60,4 @@ post-install:
-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/devel/boost-python-libs/Makefile
==============================================================================
--- head/devel/boost-python-libs/Makefile Sun Sep 27 21:58:17 2015 (r398059)
+++ head/devel/boost-python-libs/Makefile Sun Sep 27 21:58:31 2015 (r398060)
@@ -49,4 +49,4 @@ post-install:
-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list