Always use iconv from libc on FreeBSD 10 even when libiconv is installed.
Responsible Changed From-To: freebsd-ports-bugs->kde Over to maintainer (via the GNATS Auto Assign Tool)
Responsible Changed From-To: kde->tijl Approved, please commit.
Author: tijl Date: Thu Feb 13 19:44:33 2014 New Revision: 344139 URL: http://svnweb.freebsd.org/changeset/ports/344139 QAT: https://qat.redports.org/buildarchive/r344139/ Log: Always use iconv from libc when available even when libiconv is installed. PR: ports/186704 Approved by: kde (makc) Modified: head/deskutils/libstreamanalyzer/Makefile head/deskutils/libstreams/Makefile Modified: head/deskutils/libstreamanalyzer/Makefile ============================================================================== --- head/deskutils/libstreamanalyzer/Makefile Thu Feb 13 19:42:23 2014 (r344138) +++ head/deskutils/libstreamanalyzer/Makefile Thu Feb 13 19:44:33 2014 (r344139) @@ -2,7 +2,7 @@ PORTNAME= libstreamanalyzer PORTVERSION= ${STRIGI_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${STRIGI_MASTER_SITES} @@ -36,4 +36,10 @@ post-patch: ${WRKSRC}/libstreamanalyzer/CMakeLists.txt .include <${.CURDIR}/../strigi/Makefile.common> -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CMAKE_ARGS+= -DICONV_LIBRARIES:STRING="/usr/lib/libc.so" +.endif + +.include <bsd.port.post.mk> Modified: head/deskutils/libstreams/Makefile ============================================================================== --- head/deskutils/libstreams/Makefile Thu Feb 13 19:42:23 2014 (r344138) +++ head/deskutils/libstreams/Makefile Thu Feb 13 19:44:33 2014 (r344139) @@ -2,6 +2,7 @@ PORTNAME= libstreams PORTVERSION= ${STRIGI_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${STRIGI_MASTER_SITES} @@ -17,4 +18,10 @@ post-patch: ${WRKSRC}/libstreams/CMakeLists.txt .include <${.CURDIR}/../strigi/Makefile.common> -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CMAKE_ARGS+= -DICONV_LIBRARIES:STRING="/usr/lib/libc.so" +.endif + +.include <bsd.port.post.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed in r344139.
Hi Tijl, Is this patch still valid? This, plus Uses/iconv.mk not including localbase.mk when it depends on the iconv port, is causing failures in the CMake 3.3.1 exp-run (bug 202516) on 10.1-RELEASE, as the port depends on converters/iconv but forces a dependency on base's iconv that fails because /usr/local/include/iconv.h ends up being preferred when building.