diff options
| author |   Mingde (Matthew) Zeng <matthew.zeng@windriver.com> | 2020-04-08 10:44:27 -0400 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-04-08 11:21:13 -0700 |
| commit | 6d80111b244f549ae3c2768d6e3872aa746ec1cf (patch) | |
| tree | 1fcbf0d502a85e82144278f87ac7cecc09a3b88f /meta-oe | |
| parent | 26801c58ee2b0621bd55fc6269abc874d5da5017 (diff) | |
| download | meta-openembedded-contrib-6d80111b244f549ae3c2768d6e3872aa746ec1cf.tar.gz | |
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 <matthew.zeng@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/poppler/poppler_0.86.1.bb | 2 |
1 files changed, 1 insertions, 1 deletions
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" |