changeset 1283:6c0b22162e7e

compression/libarchive: remove unneeded options
author David Demelier <markand@malikania.fr>
date Mon, 15 Nov 2021 09:11:22 +0100
parents 38c17adf4f89
children 1ddc16795d5e
files compression/libarchive/libarchive.sh
diffstat 1 files changed, 2 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/compression/libarchive/libarchive.sh	Mon Nov 15 09:10:38 2021 +0100
+++ b/compression/libarchive/libarchive.sh	Mon Nov 15 09:11:22 2021 +0100
@@ -21,7 +21,7 @@
 PKGLICENSE="BSD"
 PKGSUMMARY="multi-format archive and compression library"
 PKGDOWNLOAD="http://www.libarchive.org/downloads/$PKGNAME-$PKGVERSION.tar.gz"
-PKGOPTIONS="ACL BZIP2 LZ4 LZMA LZO SSL XML ZLIB ZSTD"
+PKGOPTIONS="ACL BZIP2 LZ4 LZMA SSL XML ZLIB ZSTD"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -35,7 +35,6 @@
 : ${BZIP2:=yes}
 : ${LZ4:=yes}
 : ${LZMA:=yes}
-: ${LZO:=no}            # upstream default as of 3.3.3
 : ${SSL:=yes}
 : ${XML:=yes}
 : ${ZLIB:=yes}
@@ -76,20 +75,6 @@
 	with_lzma="--without-lzma"
 fi
 
-if [ "$LZO" = "yes" ]; then
-	PKGDEPENDS="lzo $PKGDEPENDS"
-	with_lzo="--with-lzo2"
-else
-	with_lzo="--without-lzo2"
-fi
-
-if [ "$NETTLE" = "yes" ]; then
-	PKGDEPENDS="lib/nettle $PKGDEPENDS"
-	with_nettle="--with-nettle"
-else
-	with_nettle="--without-nettle"
-fi
-
 if [ "$SSL" = "yes" ]; then
 	PKGDEPENDS="libressl $PKGDEPENDS"
 	with_ssl="--with-openssl"
@@ -132,13 +117,12 @@
 		--enable-bsdcat=shared \
 		--enable-bsdcpio=shared \
 		--without-xml2 \
+		--without-libb2 \
 		$with_acl \
 		$with_bzip2 \
 		$with_expat \
 		$with_lz4 \
 		$with_lzma \
-		$with_lzo \
-		$with_nettle \
 		$with_ssl \
 		$with_zlib \
 		$with_zstd