Date: Thu, 12 May 2016 13:36:46 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415064 - head/Mk/Uses Message-ID: <201605121336.u4CDak16017972@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu May 12 13:36:46 2016 New Revision: 415064 URL: https://svnweb.freebsd.org/changeset/ports/415064 Log: Always add -DLIBICONV_PLUG to CPPFLAGS and friends when the base system iconv(3) is used. Adding it only when LOCALBASE/include/iconv.h exists is not enough because this is tested before dependencies are installed and they may pull in converters/libiconv. PR: 209302 Exp-run by: antoine Approved by: portmgr (antoine) Modified: head/Mk/Uses/iconv.mk Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Thu May 12 13:13:36 2016 (r415063) +++ head/Mk/Uses/iconv.mk Thu May 12 13:36:46 2016 (r415064) @@ -45,12 +45,13 @@ ICONV_LIB_PATH= /usr/lib/libc.so || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ || exists(${LOCALBASE}/include/iconv.h) BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv +ICONV_INCLUDE_PATH= ${LOCALBASE}/include +.endif + CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG OBJCFLAGS+= -DLIBICONV_PLUG -ICONV_INCLUDE_PATH= ${LOCALBASE}/include -.endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605121336.u4CDak16017972>