[oe-commits] Joe MacDonald : wireshark: update configuration and epoch

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: a9636f77ac00bafd1429dc52bdf2f8f2446866f9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a9636f77ac00bafd1429dc52bdf2f8f2446866f9

Author: Joe MacDonald <joe_macdonald at mentor.com>
Date:   Wed Aug  6 15:36:00 2014 -0400

wireshark: update configuration and epoch

Commit 6d781369 warranted a PE bump but didn't include it.  Update it,
correct a typo in EXTRA_OECONF and explicitly disable c-ares resolver at
the same time.

Acked-by: Armin Kuster <akuster at mvista.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
index 449ac47..13b1f3f 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_1.12.0.bb
@@ -23,13 +23,15 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6,"
 PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls"
 PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt"
 
-EXTRA_OECONF = "--with-qt=no --enable-usr-local=no -enable-tshark"
+EXTRA_OECONF = "--with-qt=no --enable-usr-local=no --enable-tshark --with-c-ares=no"
 
 LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0"
 SRC_URI = " \
     http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-1.12.0.tar.bz2 \
 "
 
+PE = "1"
+
 SRC_URI[md5sum] = "8dcfe451d8769901129809d2e19c1fb7"
 SRC_URI[sha256sum]= "0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7"