[PATCH] file: add PACKAGECONFIG for auto options

[PATCH] file: add PACKAGECONFIG for auto options

[Konrad Weihmann]

A few options of file configure are set to auto, which can lead to
unpredictable effect when something in the sysroot does provide
things that satisfy the autotools checks.
In the worst case this will lead to package-qa failure 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

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
---
 meta/recipes-devtools/file/file_5.38.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/file/file_5.38.bb b/meta/recipes-devtools/file/file_5.38.bb
index b8f09107e8..fef21aa147 100644
--- a/meta/recipes-devtools/file/file_5.38.bb
+++ b/meta/recipes-devtools/file/file_5.38.bb
@@ -8,7 +8,7 @@ SECTION = "console/utils"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b"
 
-DEPENDS = "zlib file-replacement-native"
+DEPENDS = "file-replacement-native"
 DEPENDS_class-native = "zlib-native"
 
 SRC_URI = "git://github.com/file/file.git"
@@ -18,6 +18,11 @@ S = "${WORKDIR}/git"
 
 inherit autotools update-alternatives
 
+PACKAGECONFIG ??= "zlib"
+PACKAGECONFIG[bz2] = ",--disable-bzlib,bzip2"
+PACKAGECONFIG[lzma] = ",--disable-xzlib,xz"
+PACKAGECONFIG[zlib] = ",--disable-zlib,zlib"
+
 EXTRA_OECONF += "--disable-libseccomp"
 
 ALTERNATIVE_${PN} = "file"
-- 
2.20.1

Re: [OE-core] [PATCH] file: add PACKAGECONFIG for auto options

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

On Sat, 9 May 2020 at 22:43, Konrad Weihmann <kweihmann@outlook.com> wrote:

> +PACKAGECONFIG ??= "zlib"
> +PACKAGECONFIG[bz2] = ",--disable-bzlib,bzip2"
> +PACKAGECONFIG[lzma] = ",--disable-xzlib,xz"
> +PACKAGECONFIG[zlib] = ",--disable-zlib,zlib"
>

It's better to explicitly list the enabling options too. If upstream
decides to remove support for any of these, we'll be able to catch that.

Alex

[-- Attachment #2: Type: text/html, Size: 768 bytes --]