helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

wireshark: poppler: prevent PACKAGECONFIG change based on different layers

Browse Source 
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Mingde (Matthew) Zeng 2020-04-08 10:44:27 -04:00 committed by Khem Raj
parent 26801c58ee
commit 6d80111b24
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-networking/recipes-support/wireshark/wireshark_3.2.2.bb
View File

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

2
meta-oe/recipes-support/poppler/poppler_0.86.1.bb
View File

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