From ed3bdd7fbc633124c01008a6dc6952c9d0857019 Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Mon, 11 May 2020 21:28:06 +0200 Subject: file: add PACKAGECONFIG for auto options A few options of file configure are set to auto, which can lead to unpredictable effects when something in the sysroot does provide things that satisfy the autotools checks. In the worst case this will lead to package-qa failures as libraries are not set in RDEPENDS but configured for the tool. To mitigate changes of accidental configure set explicit options via newly introduced PACKAGECONFIG variables for bzip, lzma and zlib support, where the default is just zlib, as it was before (From OE-Core rev: 5bfdb6bfbd6f1de10d415228e5a5ebe01a623e2a) Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-devtools/file/file_5.38.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/recipes-devtools/file/file_5.38.bb b/meta/recipes-devtools/file/file_5.38.bb index b8f09107e8..f5ad568936 100644 --- a/meta/recipes-devtools/file/file_5.38.bb +++ b/meta/recipes-devtools/file/file_5.38.bb @@ -8,8 +8,8 @@ SECTION = "console/utils" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b" -DEPENDS = "zlib file-replacement-native" -DEPENDS_class-native = "zlib-native" +DEPENDS = "file-replacement-native" +DEPENDS_class-native = "" SRC_URI = "git://github.com/file/file.git" @@ -18,6 +18,12 @@ S = "${WORKDIR}/git" inherit autotools update-alternatives +PACKAGECONFIG ??= "zlib" +PACKAGECONFIG_class-native ??= "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" ALTERNATIVE_${PN} = "file" -- cgit v1.2.3-54-g00ecf