diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-07 16:34:48 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-07 16:34:54 +0300 |
| commit | 4fe7a1353f8f7f96c7407caa3352fa50fcce5aa3 (patch) | |
| tree | e1e898e098bec469e02e357983dae7436a072235 /meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb | |
| parent | 00e122a7b3a839f5ce8b819cb1bfe92cf3781eda (diff) | |
| download | openbmc-4fe7a1353f8f7f96c7407caa3352fa50fcce5aa3.tar.xz | |
meta-openembedded: subtree update:e6d76b05a7..01d539b324
Adrian Ratiu (1):
renderdoc: add x11 to REQUIRED_DISTRO_FEATURES
Callaghan, Dan (2):
firewalld: update to 0.7.1
strongswan: install dev headers
George McCollister (1):
wireshark: fix qt5 build
Jean-Marie LEMETAYER (1):
python-toml: add recipes for python2 and python3
Khem Raj (1):
xscreensaver: Remove xserver-nodm-init rdep
Maciej Pijanowski (1):
smem: package smemcap separately
Ovidiu Panait (1):
kea: Disable parallel install
Peiran Hong (1):
zabbix: upgrade 3.0.9 -> 4.2.6
Randy MacLeod (1):
libteam: update from 1.28 to 1.29
Trevor Gamblin (2):
php: fix CVE-2019-6978
gd: fix CVE-2019-6978
Change-Id: I2c308ff46213876c1d74f42b5d9f9e52946bbf02
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb index 6de188da2..a3c0b4998 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb +++ b/meta-openembedded/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 \ |