iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
package/libarchive/libarchive.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
LIBARCHIVE_VERSION = 3.4.0
LIBARCHIVE_VERSION = 3.4.3
LIBARCHIVE_SITE = https://www.libarchive.de/downloads
LIBARCHIVE_INSTALL_STAGING = YES
LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause, CC0-1.0, OpenSSL, Apache-2.0
@@ -78,14 +78,29 @@ else
LIBARCHIVE_CONF_OPTS += --without-xml2
endif
ifeq ($(BR2_PACKAGE_LZ4),y)
LIBARCHIVE_CONF_OPTS += --with-lz4
LIBARCHIVE_DEPENDENCIES += lz4
else
LIBARCHIVE_CONF_OPTS += --without-lz4
endif
ifeq ($(BR2_PACKAGE_LZO),y)
LIBARCHIVE_DEPENDENCIES += lzo
else
LIBARCHIVE_CONF_OPTS += --without-lzo2
endif
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
LIBARCHIVE_DEPENDENCIES += mbedtls
LIBARCHIVE_CONF_OPTS += --with-mbedtls
else
LIBARCHIVE_CONF_OPTS += --without-mbedtls
endif
ifeq ($(BR2_PACKAGE_NETTLE),y)
LIBARCHIVE_DEPENDENCIES += nettle
LIBARCHIVE_CONF_OPTS += --with-nettle
else
LIBARCHIVE_CONF_OPTS += --without-nettle
endif
@@ -110,6 +125,13 @@ else
LIBARCHIVE_CONF_OPTS += --without-lzma
endif
ifeq ($(BR2_PACKAGE_ZSTD),y)
LIBARCHIVE_DEPENDENCIES += zstd
LIBARCHIVE_CONF_OPTS += --with-zstd
else
LIBARCHIVE_CONF_OPTS += --without-zstd
endif
# The only user of host-libarchive needs zlib support
HOST_LIBARCHIVE_DEPENDENCIES = host-zlib
HOST_LIBARCHIVE_CONF_OPTS = \
@@ -122,10 +144,13 @@ HOST_LIBARCHIVE_CONF_OPTS = \
--without-expat \
--without-libiconv-prefix \
--without-xml2 \
--without-lz4 \
--without-lzo2 \
--without-mbedtls \
--without-nettle \
--without-openssl \
--without-lzma
--without-lzma \
--without-zstd
$(eval $(autotools-package))
$(eval $(host-autotools-package))