jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 11:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/libarchive: remove double handling of zstd

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

Let's drop the part of 4bcc34446485d27efd41de70a86355a0e3798838 that
duplicates 96dc6701af877a4aa4da20a9e0d5b849cc5c8356.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2020-04-25 21:23:29 +02:00
parent 4bcc344464
commit 37e853d63c
1 changed files with 0 additions and 7 deletions
Show Stats 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