summaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorGhislain Mangé <ghislain.mange@smile.fr>2024-12-02 11:58:47 +0100
committerArmin Kuster <akuster808@gmail.com>2025-01-16 09:17:32 -0500
commitdf6844bc84e8ce3cf39ad4d548a099867c11b0ee (patch)
treecec2772b813777bbc4750d09a8f21d47d73c1c71 /meta-networking
parent7070f90c863f478388cd58390bd3e5225523da52 (diff)
downloadmeta-openembedded-df6844bc84e8ce3cf39ad4d548a099867c11b0ee.tar.gz
wireshark: use inherit_defer for conditional cases
Conditionnal inherit may be missed when PACKAGECONFIG qt5 is activated after this inherit, eg in .bbappend. see patch [0] [0]: https://lists.openembedded.org/g/bitbake-devel/message/16815 Reviewed-by: Yoann Congal <yoann.congal@smile.fr> Signed-off-by: Ghislain Mangé <ghislain.mange@smile.fr> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 97318e27ebf9f528acf77fb0759c332bd83adb4b) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
index 3fa293d0cd..9c93fd026c 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb
@@ -48,7 +48,7 @@ PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2"
48# these next two options require addional layers 48# these next two options require addional layers
49PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" 49PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg"
50 50
51inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} 51inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
52 52
53EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \ 53EXTRA_OECMAKE += "-DENABLE_NETLINK=ON \
54 -DBUILD_mmdbresolve=OFF \ 54 -DBUILD_mmdbresolve=OFF \