diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2015-02-13 08:49:55 -0800 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2015-03-21 07:48:52 -0700 |
| commit | 9c464502dcf3c12edda16b257ad1e091b7aae690 (patch) | |
| tree | 723bb6818f5bd6e97a5954ac98d664c865606977 | |
| parent | d85e6b328e38a8035d05fed600b696f540bcec3e (diff) | |
| download | meta-openembedded-contrib-9c464502dcf3c12edda16b257ad1e091b7aae690.tar.gz | |
wireshark: fix pcap-config issue
configure: error: Header file pcap.h not found; if you installed libpcap
don't use pcap. Use the internal version.
And minor configure cleanups
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_1.12.3.bb | 7 |
1 files changed, 4 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 7604bd7ff9..f16d0f68fa 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" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" -DEPENDS = "perl-native libcap libpcap pcre expat glib-2.0 sbc" +DEPENDS = "perl-native pcre expat glib-2.0 sbc" SRC_URI = " \ http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PV}.tar.bz2 \ @@ -23,10 +23,11 @@ ARM_INSTRUCTION_SET = "arm" # Works with either gtk+ or gtk3. WHICH_GTK = "gtk3" -PACKAGECONFIG ??= "gnutls gcrypt libnl" +PACKAGECONFIG ??= "libcap gnutls libnl" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK} graphics", "", d)}" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" +PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_DIR_HOST}, --with-libcap=no, libcap" PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" @@ -45,7 +46,7 @@ PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark" +EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --with-pcap=no --enable-pcap-ng-default" do_configure_prepend() { # force to use fallback |