svn commit: r398027 - head/devel/boost-libs

[Don Lewis]

Author: truckman
Date: Sun Sep 27 08:33:59 2015
New Revision: 398027
URL: https://svnweb.freebsd.org/changeset/ports/398027

Log:
  Unbreak the build when the ICU option is unset on FreeBSD 9.3.
  
  USES must be set before including bsd.port.pre.mk, which is included
  by boost-all/compiled.mk.  The easiest fix for the conditional
  USES+=iconv being too late seems to be to use an option helper.
  For consistency use an option helper for the LIB_DEPENDS.
  
  PR:		203285

Modified:
  head/devel/boost-libs/Makefile

Modified: head/devel/boost-libs/Makefile
==============================================================================
--- head/devel/boost-libs/Makefile	Sun Sep 27 08:31:28 2015	(r398026)
+++ head/devel/boost-libs/Makefile	Sun Sep 27 08:33:59 2015	(r398027)
@@ -13,6 +13,9 @@ OPTIONS_DEFAULT=	ICU
 VERBOSE_BUILD_DESC=	Show compiler messages
 ICU_DESC=		Boost.Regex with ICU unicode support
 
+ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
+ICU_USES_OFF=		iconv
+
 .include "${.CURDIR}/../boost-all/common.mk"
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
@@ -28,11 +31,9 @@ PLIST_SUB+=	COROUTINE="" CONTEXT="" LOCA
 .endif
 
 .if ${PORT_OPTIONS:MICU}
-LIB_DEPENDS+=	libicuuc.so:${PORTSDIR}/devel/icu
 BJAM_ARGS+=	-sICU_PATH=${LOCALBASE}
 .else
-USES+=		iconv
-BJAM_ARGS+=	-sICONV_PATH=${LOCALBASE}
+BJAM_ARGS+=	-sICONV_PATH=${ICONV_PREFIX}
 .endif
 
 do-build: