mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

Add a separate option to allow iconv support to be disabled, but leave

Browse Source 
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
This commit is contained in:
Don Lewis 2015-10-01 22:55:26 +00:00
parent f038edf126
commit dd74126d73
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=398395
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devel/boost-libs/Makefile
View File

@ -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"

2
devel/boost-libs/pkg-descr
View File

@ -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/