mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-28 21:11:41 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libarchive: remove double handling of zstd

Browse Source 
When 4bcc344464 was applied, it was not
noticed that 96dc6701af (from another
contributor) had already been
applied. 4bcc344464 essentially did the
same thing as 96dc6701af, except it also
disable zstd support explicitly in the host-libarchive package.

Let's drop the part of 4bcc344464 that
duplicates 96dc6701af.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 37e853d63c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni
2020-04-25 21:23:29 +02:00
committed by Peter Korsgaard
parent beb89fd77f
commit 54d0ae1bfe
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/libarchive/libarchive.mk
View File

@@ -111,13 +111,6 @@ else
LIBARCHIVE_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_ZSTD),y)
LIBARCHIVE_CONF_OPTS += --with-zstd
LIBARCHIVE_DEPENDENCIES += zstd
else
LIBARCHIVE_CONF_OPTS += --without-zstd
endif
# libarchive requires LZMA with thread support in the toolchain
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_PACKAGE_XZ),yy)
LIBARCHIVE_DEPENDENCIES += xz