Date: Fri, 14 Aug 2015 21:20:11 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394260 - head/archivers/libarchive Message-ID: <201508142120.t7ELKBKu070324@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Aug 14 21:20:10 2015 New Revision: 394260 URL: https://svnweb.freebsd.org/changeset/ports/394260 Log: Add explicit USES=iconv, libarchive was linking against libiconv/libcharset when they were found and dependency was not registered Modified: head/archivers/libarchive/Makefile Modified: head/archivers/libarchive/Makefile ============================================================================== --- head/archivers/libarchive/Makefile Fri Aug 14 21:02:58 2015 (r394259) +++ head/archivers/libarchive/Makefile Fri Aug 14 21:20:10 2015 (r394260) @@ -2,7 +2,7 @@ PORTNAME= libarchive PORTVERSION= 3.1.2 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= archivers MASTER_SITES= http://libarchive.org/downloads/ @@ -18,7 +18,7 @@ OPTIONS_DEFAULT=LZO LZO_DESC= Support lzo compression via liblzo2 NETTLE_DESC= Use Nettle instead of OpenSSL -USES= cpe libtool pathfix +USES= cpe iconv libtool pathfix GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -88,7 +88,15 @@ NETTLE_CONFIGURE_ON= --without-openssl NETTLE_USE_OFF= OPENSSL=yes NETTLE_CONFIGURE_OFF= --with-openssl +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CONFIGURE_ENV+= ac_cv_header_localcharset_h=no \ + ac_cv_func_locale_charset=no \ + ac_cv_lib_charset_locale_charset=no +.endif + check: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check) -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508142120.t7ELKBKu070324>