Date: Tue, 13 Jun 2017 13:28:49 +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: r443499 - head/Mk/Uses Message-ID: <201706131328.v5DDSnfs097665@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Jun 13 13:28:49 2017 New Revision: 443499 URL: https://svnweb.freebsd.org/changeset/ports/443499 Log: Remove check for unsupported versions of FreeBSD and add some comments. Submitted by: John Hein <john.hein@microsemi.com> Modified: head/Mk/Uses/iconv.mk Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Tue Jun 13 10:44:52 2017 (r443498) +++ head/Mk/Uses/iconv.mk Tue Jun 13 13:28:49 2017 (r443499) @@ -41,13 +41,12 @@ ICONV_CONFIGURE_BASE= ICONV_INCLUDE_PATH= /usr/include ICONV_LIB_PATH= /usr/lib/libc.so -.if (${OPSYS} == FreeBSD && \ - (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069)) \ - || exists(${LOCALBASE}/include/iconv.h) +.if exists(${LOCALBASE}/include/iconv.h) +# Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to work. BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv -ICONV_INCLUDE_PATH= ${LOCALBASE}/include .endif +# LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h. CPPFLAGS+= -DLIBICONV_PLUG CFLAGS+= -DLIBICONV_PLUG CXXFLAGS+= -DLIBICONV_PLUG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706131328.v5DDSnfs097665>