summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGhislain Mangé <ghislain.mange@smile.fr>2024-12-02 11:58:47 +0100
committerKhem Raj <raj.khem@gmail.com>2024-12-03 09:44:31 -0800
commit97318e27ebf9f528acf77fb0759c332bd83adb4b (patch)
tree0cf4e1b03b2b0e060e9ac4abf3103566d7add20e
parentcc83b9ac17276c6ebb590a7e84e86239b9836e0f (diff)
downloadmeta-openembedded-97318e27ebf9f528acf77fb0759c332bd83adb4b.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>
-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 be342c73b6..0109fe6d2e 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 -DUSE_qt6=OFF, -DENABLE_QT5=OFF -DBUILD_wireshark=OFF, qttools-native qtmultimedia qtsvg" 49PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON -DBUILD_wireshark=ON -DUSE_qt6=OFF, -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 \