summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap/libpcap.inc
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2016-11-08 09:52:48 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:18:49 +0000
commit62771b5a426e4b7d38e4997dc3f252a547f481ce (patch)
tree80ba29acd5097d19d92c6f0eff1d538e67950137 /meta/recipes-connectivity/libpcap/libpcap.inc
parent7812e6e5b0c8f4e0bb289d87f9fa9e0748390edf (diff)
downloadopenembedded-core-contrib-62771b5a426e4b7d38e4997dc3f252a547f481ce.tar.gz
libpcap: Update to version 1.8.1
- Option --enable-canusb was removed on commit: https://github.com/the-tcpdump-group/libpcap/commit/93ca5ff7030aaf1219e1de05ec89a68384bfc50b - Autotools class was improved and we can now stop aclocal from running at all. - File configure.in was renamed to configure.ac, rework libpcap-pkgconfig-support patch and do_configure_prepend task to use configure.ac file. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/libpcap/libpcap.inc')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 7b29a52dcd..4453a9e2ae 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -19,6 +19,7 @@ BINCONFIG = "${bindir}/pcap-config"
inherit autotools binconfig-disabled pkgconfig bluetooth
EXTRA_OECONF = "--with-pcap=linux"
+EXTRA_AUTORECONF += "--exclude=aclocal"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
@@ -26,7 +27,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ
PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
PACKAGECONFIG[bluez5] = ",,"
-PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
@@ -36,8 +36,5 @@ CFLAGS_prepend = "-I${S} "
CXXFLAGS_prepend = "-I${S} "
do_configure_prepend () {
- if [ ! -e ${S}/acinclude.m4 ]; then
- cat ${S}/aclocal.m4 > ${S}/acinclude.m4
- fi
sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
}