summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2015-01-23 09:43:46 -0800
committerJoe MacDonald <joe_macdonald@mentor.com>2015-01-26 10:27:55 -0500
commit8912083e23e0fde68a2619f3df6b48e2e6f28197 (patch)
treecf990f0a7517fd8d5b59aabb1f39a5c7c8ae6b7f
parent6b76fffbb16351d0031c6b863a2deb9c60ec8dc7 (diff)
downloadmeta-openembedded-8912083e23e0fde68a2619f3df6b48e2e6f28197.tar.gz
wireshark: fix rdepends issue
Added a few more PACKAGECONF options Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb14
1 files changed, 11 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb
index 2dd99d698..7604bd7ff 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb
@@ -4,7 +4,7 @@ SECTION = "network"
4LICENSE = "GPL-2.0" 4LICENSE = "GPL-2.0"
5LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" 5LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
6 6
7DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 libnl sbc" 7DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 sbc"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ 10 http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \
@@ -23,11 +23,12 @@ ARM_INSTRUCTION_SET = "arm"
23# Works with either gtk+ or gtk3. 23# Works with either gtk+ or gtk3.
24WHICH_GTK = "gtk3" 24WHICH_GTK = "gtk3"
25 25
26PACKAGECONFIG ??= "gnutls gcrypt" 26PACKAGECONFIG ??= "gnutls gcrypt libnl"
27PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK} graphics", "", d)}" 27PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK} graphics", "", d)}"
28PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" 28PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
29 29
30PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" 30PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi"
31PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl"
31PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" 32PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19"
32PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" 33PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+"
33PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" 34PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3"
@@ -36,8 +37,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
36PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" 37PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
37PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" 38PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
38PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5" 39PACKAGECONFIG[krb5] = "--with-krb5=yes, --with-krb5=no, krb5"
40PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua"
41PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib"
42PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip"
39 43
40EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no" 44# these next two options require addional layers
45PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns"
46PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares"
47
48EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark"
41 49
42do_configure_prepend() { 50do_configure_prepend() {
43 # force to use fallback 51 # force to use fallback