From 6d80111b244f549ae3c2768d6e3872aa746ec1cf Mon Sep 17 00:00:00 2001 From: "Mingde (Matthew) Zeng" Date: Wed, 8 Apr 2020 10:44:27 -0400 Subject: [PATCH] wireshark: poppler: prevent PACKAGECONFIG change based on different layers 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 Signed-off-by: Khem Raj --- meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb | 2 +- meta-oe/recipes-support/poppler/poppler_0.86.1.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 91a7e1a36d..db545028f2 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.86.1.bb b/meta-oe/recipes-support/poppler/poppler_0.86.1.bb index 96006dc8db..073edef86e 100644 --- a/meta-oe/recipes-support/poppler/poppler_0.86.1.bb +++ b/meta-oe/recipes-support/poppler/poppler_0.86.1.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"