Attachment 161519 Details for Bug 198658 – patch to disable use of iconv when the ICU option is disabled

[patch] patch to disable use of iconv when the ICU option is disabled

boost-libs-iconv.patch2 (text/plain), 1.49 KB, created by Don Lewis on 2015-09-29 08:41:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2015-09-29 08:41:52 UTC

Size: 1.49 KB

patch

obsolete

>Index: devel/boost-libs/Makefile
>===================================================================
>--- devel/boost-libs/Makefile	(revision 398065)
>+++ devel/boost-libs/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	boost-libs
>+PORTREVISION=	9
>+
> COMMENT=	Free portable C++ libraries (without Boost.Python)
> 
>-PORTREVISION=	8
>-
> BUILD_DEPENDS+=	bjam:${PORTSDIR}/devel/boost-jam
> 
> OPTIONS_DEFINE=	VERBOSE_BUILD DEBUG ICU OPTIMIZED_CFLAGS
>@@ -14,9 +14,13 @@
> ICU_DESC=		Boost.Regex with ICU unicode support
> 
> ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
>-ICU_VARS=		BJAM_ARGS+=-sICU_PATH=${LOCALBASE}
>+ICU_VARS=		BJAM_ARGS+=boost.locale.iconv=off \
>+			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
>+# Would like to also specify: BJAM_ARGS+=-sICONV_PATH=${ICONV_PREFIX},
>+# but does not work, probably because ${ICONV_PREFIX} is set too late, so
>+# we have to use .if below
> 
> .include "${.CURDIR}/../boost-all/common.mk"
> 
>@@ -32,6 +36,12 @@
> PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCALE="" LOG=""
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+.if !${PORT_OPTIONS:MICU}
>+BJAM_ARGS+=	-sICONV_PATH=${ICONV_PREFIX}
>+.endif
>+
> do-build:
> 	@cd ${WRKSRC} && \
> 		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS} stage
>@@ -60,4 +70,4 @@
> 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
> 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 198658: 161512 | 161519 | 161627