diff options
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-support')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.0.3.bb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb index 9310a93fe..5408eed27 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.8.1.bb @@ -19,6 +19,7 @@ UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" EXTRA_OECONF = " \ --without-lib-prefix \ + --with-dev-headers=${includedir}/strongswan \ " EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" @@ -48,7 +49,7 @@ RRECOMMENDS_${PN} = "kernel-module-ipsec" FILES_${PN} += "${libdir}/ipsec/lib*${SOLIBS}" FILES_${PN}-dbg += "${bindir}/.debug ${sbindir}/.debug ${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug" -FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la" +FILES_${PN}-dev += "${libdir}/ipsec/lib*${SOLIBSDEV} ${libdir}/ipsec/*.la ${libdir}/ipsec/include/config.h" FILES_${PN}-staticdev += "${libdir}/ipsec/*.a" CONFFILES_${PN} = "${sysconfdir}/*.conf ${sysconfdir}/ipsec.d/*.conf ${sysconfdir}/strongswan.d/*.conf" 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 \ |