mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libarchive: add bsdunzip option

Browse Source 
Add bsdunzip option to avoid the following build failure raised since
bump to version 3.7.1 in commit 7991d2c48a and
c157e4ce8e:

  CCLD     bsdunzip
/home/autobuild/autobuild/instance-4/output-1/host/lib/gcc/powerpc-buildroot-linux-musl/12.3.0/../../../../powerpc-buildroot-linux-musl/bin/ld: cannot find -lz: No such file or directory

By handling it explicitly, we can specify whether the dynamic or static
library should be used, according to what we actually have available.

Fixes:
 - http://autobuild.buildroot.org/results/aaf7fdefa0b7bd7e5ac743487c197544c1a2ce6f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Tested-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
(cherry picked from commit bbc08b15ae)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2023-09-16 17:10:15 +02:00
committed by Peter Korsgaard
parent 40b20e5feb
commit 35381a360a
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/libarchive/Config.in
View File

@@ -30,4 +30,10 @@ config BR2_PACKAGE_LIBARCHIVE_BSDCAT
The 'bsdcat' program is a simple replacement tool The 'bsdcat' program is a simple replacement tool
for zcat, bzcat, xzcat, and such. for zcat, bzcat, xzcat, and such.
config BR2_PACKAGE_LIBARCHIVE_BSDUNZIP
bool "bsdunzip"
help
The 'bsdunzip' program is a simple replacement tool
for Info-ZIP.
endif endif

10
package/libarchive/libarchive.mk
View File

@@ -46,6 +46,16 @@ else
LIBARCHIVE_CONF_OPTS += --disable-bsdcat LIBARCHIVE_CONF_OPTS += --disable-bsdcat
endif endif
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDUNZIP),y)
ifeq ($(BR2_STATIC_LIBS),y)
LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=static
else
LIBARCHIVE_CONF_OPTS += --enable-bsdunzip=shared
endif
else
LIBARCHIVE_CONF_OPTS += --disable-bsdunzip
endif
ifeq ($(BR2_PACKAGE_ACL),y) ifeq ($(BR2_PACKAGE_ACL),y)
LIBARCHIVE_DEPENDENCIES += acl LIBARCHIVE_DEPENDENCIES += acl
else else