[oe-commits] [meta-openembedded] 05/14: wireshark: fix qt5 build

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit f19cdd26614ce508794d66e4f2fab872ebd5f994
Author: George McCollister <george.mccollister at gmail.com>
AuthorDate: Thu Oct 3 13:08:31 2019 -0500

    wireshark: fix qt5 build
    
    Add qttools-native to PACKAGECONFIG[qt5] DEPENDS to resolve missing
    Qt5LinguistTools build error.
    
    Add qtmultimedia to PACKAGECONFIG[qt5] DEPENDS to resolve missing
    Qt5Multimedia build error.
    
    Add qtsvg to PACKAGECONFIG[qt5] DEPENDS to resolve missing Qt5Svg build
    error.
    
    Inherit cmake_qt5 when qt5 is in PACKAGECONFIG to resolve
    get_target_property() called with non-existent target "Qt5::qmake"
    build error.
    
    Automatically add qt5 to PACKAGECONFIG when meta-qt5 is in the build
    since adding qt5 via a .bbappend won't satisfy the conditional inherit
    cmake_qt5. The poppler recipe does exactly this.
    
    Signed-off-by: George McCollister <george.mccollister at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb b/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb
index 6de188d..a3c0b49 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb
@@ -19,7 +19,7 @@ PE = "1"
 
 inherit cmake pkgconfig python3native perlnative upstream-version-is-even
 
-PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
+PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)}"
 
 PACKAGECONFIG_class-native = "libpcap gnutls ssl libssh"
 
@@ -41,7 +41,9 @@ PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4"
 
 # these next two options require addional layers
 PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares"
-PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qtbase"
+PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
+
+inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
 
 EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
                   -DBUILD_mmdbresolve=OFF \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.