Date: Thu, 1 Oct 2015 22:55:26 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398395 - head/devel/boost-libs Message-ID: <201510012255.t91MtQWN043864@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Thu Oct 1 22:55:26 2015 New Revision: 398395 URL: https://svnweb.freebsd.org/changeset/ports/398395 Log: Add a separate option to allow iconv support to be disabled, but leave it enabled by default to avoid a regression in the science/orthanc unit tests. Set USES=iconv whenever ICONV is enabled, rather than only when ICU is disabled. With the default option settings, this will bring in converters/iconv on FreeBSD 9, which will unbreak the failing unit tests in science/orthanc. At least one of the ICONV or ICU options must be set. Fix PR 198658 in the default case by setting BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX} whenever iconv support is enabled, not only when ICU is disabled as was done in r398027 (before that was broken by r398060 and fixed again in the ports framework by r398258). Pet portlint. PR: 198658 Modified: head/devel/boost-libs/Makefile head/devel/boost-libs/pkg-descr Modified: head/devel/boost-libs/Makefile ============================================================================== --- head/devel/boost-libs/Makefile Thu Oct 1 22:30:32 2015 (r398394) +++ head/devel/boost-libs/Makefile Thu Oct 1 22:55:26 2015 (r398395) @@ -2,21 +2,26 @@ # $FreeBSD$ PORTNAME= boost-libs -COMMENT= Free portable C++ libraries (without Boost.Python) +PORTREVISION= 9 -PORTREVISION= 8 +COMMENT= Free portable C++ libraries (without Boost.Python) BUILD_DEPENDS+= bjam:${PORTSDIR}/devel/boost-jam -OPTIONS_DEFINE= VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS -OPTIONS_DEFAULT= ICU +OPTIONS_DEFINE= VERBOSE_BUILD DEBUG OPTIMIZED_CFLAGS +OPTIONS_MULTI= LOCALE +OPTIONS_MULTI_LOCALE= ICONV ICU +OPTIONS_DEFAULT= ICONV ICU VERBOSE_BUILD_DESC= Show compiler messages -ICU_DESC= Boost.Regex with ICU unicode support +ICONV_DESC= Boost.Locale with iconv encoding support +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 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} +ICU_VARS_OFF= BJAM_ARGS+=boost.locale.icu=off .include "${.CURDIR}/../boost-all/common.mk" Modified: head/devel/boost-libs/pkg-descr ============================================================================== --- head/devel/boost-libs/pkg-descr Thu Oct 1 22:30:32 2015 (r398394) +++ head/devel/boost-libs/pkg-descr Thu Oct 1 22:55:26 2015 (r398395) @@ -16,4 +16,4 @@ libraries are proposed for TR2. NOTE: This package does not contain Boost.Python, it's in 'devel/boost-python-libs'. -WWW: http://www.boost.org/ +WWW: http://www.boost.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510012255.t91MtQWN043864>