[PATCH] wireshark: poppler: prevent PACKAGECONFIG change based on different layers

[PATCH] wireshark: poppler: prevent PACKAGECONFIG change based on different layers

[Matthew]

    As per discussed in a previous email under the subject "Regarding
    poppler auto PACKAGECONFIG when qt5-layer exists", adding a layer
    but not using it should not change PACKAGECONFIG automatically. It
    may result unexpected error.

Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com>
---
 meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +-
 meta-oe/recipes-support/poppler/poppler_0.85.0.bb            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
index 91a7e1a36..db545028f 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
@@ -19,7 +19,7 @@ PE = "1"

 inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg

-PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"

 PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"

diff --git a/meta-oe/recipes-support/poppler/poppler_0.85.0.bb b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
index 2f5d094fb..366f0c5cf 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
@@ -14,7 +14,7 @@ DEPENDS = "fontconfig zlib cairo lcms glib-2.0"

 inherit cmake pkgconfig gobject-introspection

-PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
+PACKAGECONFIG ??= "jpeg openjpeg png tiff nss"
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
 PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff"
--
2.24.0

Re: [oe] [PATCH] wireshark: poppler: prevent PACKAGECONFIG change based on different layers

[Khem Raj]

On Tue, Apr 7, 2020 at 12:34 PM Matthew <matthew.zeng@windriver.com> wrote:
>
>     As per discussed in a previous email under the subject "Regarding
>     poppler auto PACKAGECONFIG when qt5-layer exists", adding a layer
>     but not using it should not change PACKAGECONFIG automatically. It
>     may result unexpected error.
>

Please rebase it on latest master or master-next and resend it


> Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com>
> ---
>  meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +-
>  meta-oe/recipes-support/poppler/poppler_0.85.0.bb            | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
> index 91a7e1a36..db545028f 100644
> --- a/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
> +++ b/meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
> @@ -19,7 +19,7 @@ PE = "1"
>
>  inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg
>
> -PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5 plugins', '', d)}"
> +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
>
>  PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
>
> diff --git a/meta-oe/recipes-support/poppler/poppler_0.85.0.bb b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
> index 2f5d094fb..366f0c5cf 100644
> --- a/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
> +++ b/meta-oe/recipes-support/poppler/poppler_0.85.0.bb
> @@ -14,7 +14,7 @@ DEPENDS = "fontconfig zlib cairo lcms glib-2.0"
>
>  inherit cmake pkgconfig gobject-introspection
>
> -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
> +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss"
>  PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
>  PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
>  PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff"
> --
> 2.24.0
>