diff options
| author | antoine <antoine@FreeBSD.org> | 2015-08-15 05:20:10 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2015-08-15 05:20:10 +0800 |
| commit | db321c207261847ab58e1488b3e8a2911d50d724 (patch) | |
| tree | e625f2cf65d6fbcc53a4a8f0ed16d27bfdd7f90d /archivers | |
| parent | 494195547038b5c87ae70c5ad4f2a2e60172ebab (diff) | |
| download | freebsd-ports-gnome-db321c207261847ab58e1488b3e8a2911d50d724.tar.gz freebsd-ports-gnome-db321c207261847ab58e1488b3e8a2911d50d724.tar.zst freebsd-ports-gnome-db321c207261847ab58e1488b3e8a2911d50d724.zip | |
Add explicit USES=iconv, libarchive was linking against libiconv/libcharset
when they were found and dependency was not registered
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libarchive/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/archivers/libarchive/Makefile b/archivers/libarchive/Makefile index 624a274a399c..942ba4f45c0e 100644 --- a/archivers/libarchive/Makefile +++ b/archivers/libarchive/Makefile @@ -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> |