[PATCH v3] file: add PACKAGECONFIG for auto options

[PATCH v3] file: add PACKAGECONFIG for auto options

[Konrad Weihmann]

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

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

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"
-- 
2.20.1

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

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Konrad Weihmann
> Sent: den 10 maj 2020 22:30
> To: openembedded-core@lists.openembedded.org
> Cc: Konrad Weihmann <kweihmann@outlook.com>
> Subject: [OE-core] [PATCH v3] 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
> 
> Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
> ---
>  meta/recipes-devtools/file/file_5.38.bb | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> 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"

Remove PACKAGECONFIG_class-native. It is not needed since it matches 
PACKAGECONFIG.

> +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"
> --
> 2.20.1

//Peter