wireshark: poppler: prevent PACKAGECONFIG change based on different layers
PATCH 1/1 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 <[email protected]>
--- 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(-)
meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +1 -1
@@ -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"
meta-oe/recipes-support/poppler/poppler_0.85.0.bb +1 -1
@@ -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
Quoted 6 lines · 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.
Please rebase it on latest master or master-next and resend it
Quoted 35 lines
Signed-off-by Matthew Zeng <[email protected]>--- 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(-)meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb +1
-1@@ -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"meta-oe/recipes-support/poppler/poppler_0.85.0.bb +1
-2@@ -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