From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 13 Mar 2023 19:37:59 +0000 (+0100)
Subject: file: add few more PACKAGECONFIGs to avoid autodetected deps from host
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1404
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b7c51fe740f00f60c591099fe5c2155b2126068c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

file: add few more PACKAGECONFIGs to avoid autodetected deps from host

* there are few more autodetected compression libs
  --disable-zlib          disable zlib compression support [default=auto]
  --disable-bzlib         disable bz2lib compression support [default=auto]
  --disable-xzlib         disable liblzma/xz compression support
  --disable-zstdlib       disable zstdlib compression support [default=auto]
  --disable-lzlib         disable liblz (lzip) compression support

  and lzlib was detected on my gentoo (even when it doesn't say that default
  is auto detection)

  I've noticed this, because I've reused sstate-cache from my gentoo build
  in docker container with ubuntu-23.04 and esdk.oeSDKExtSelfTest.test_install_libraries_headers
  test was now failing with:

  Exception: subprocess.CalledProcessError: Command '/OE/build/poky/build/build-st-2023-03-12-esdk-patch1/esdk.oeSDKExtSelfTest.test_install_libraries_headers/build-st/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/recipe-sysroot-native/usr/bin/createrepo_c --update -q /OE/build/poky/build/build-st-2023-03-12-esdk-patch1/esdk.oeSDKExtSelfTest.test_install_libraries_headers/build-st/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/oe-sdk-repo' returned non-zero exit status 127.

  Subprocess output:
  /OE/build/poky/build/build-st-2023-03-12-esdk-patch1/esdk.oeSDKExtSelfTest.test_install_libraries_headers/build-st/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/recipe-sysroot-native/usr/bin/createrepo_c: error while loading shared libraries: liblz.so.1: cannot open shared object file: No such file or directory

  and liblz.so.1 ended in createrepo_c.real because of libmagic.so from file-native-replacement.

* use PACKAGECONFIG for seccomp as well and keep it disabled as it was
  explicitly disabled before (${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)}
  can be added to default PACKAGECONFIG later if someone finds it useful)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/file/file_5.44.bb b/meta/recipes-devtools/file/file_5.44.bb
index d4b49341b79..3090d346ed4 100644
--- a/meta/recipes-devtools/file/file_5.44.bb
+++ b/meta/recipes-devtools/file/file_5.44.bb
@@ -22,8 +22,9 @@ PACKAGECONFIG ??= "bz2 lzma zlib"
 PACKAGECONFIG[bz2] = "--enable-bzlib, --disable-bzlib, bzip2"
 PACKAGECONFIG[lzma] = "--enable-xzlib, --disable-xzlib, xz"
 PACKAGECONFIG[zlib] = "--enable-zlib, --disable-zlib, zlib"
-
-EXTRA_OECONF += "--disable-libseccomp"
+PACKAGECONFIG[zstdlib] = "--enable-zstdlib, --disable-zstdlib, zstd"
+PACKAGECONFIG[lzlib] = "--enable-lzlib, --disable-lzlib, lzip"
+PACKAGECONFIG[seccomp] = "--enable-libseccomp, --disable-libseccomp, libseccomp"
 
 ALTERNATIVE:${PN} = "file"
 ALTERNATIVE_LINK_NAME[file] = "${bindir}/file"