From owner-svn-ports-head@freebsd.org Sun Sep 27 21:58:33 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B7339D03B6; Sun, 27 Sep 2015 21:58:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0BEA7F0D; Sun, 27 Sep 2015 21:58:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8RLwWOC002169; Sun, 27 Sep 2015 21:58:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8RLwWRc002166; Sun, 27 Sep 2015 21:58:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509272158.t8RLwWRc002166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 27 Sep 2015 21:58:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398060 - in head/devel: boost-all boost-libs boost-python-libs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2015 21:58:33 -0000 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 - 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 +.include 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 +.include