diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2016-11-08 09:52:48 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:54 +0000 |
commit | dd24fbfb477fe3876f2205cfcf9d55f7327dead5 (patch) | |
tree | 60171923ef35244ed72b6361332c0a4f0e3ec822 /meta/recipes-connectivity/libpcap/libpcap.inc | |
parent | ac0d917b67ff3a180986fa234c44c14a0cb38c63 (diff) | |
download | poky-dd24fbfb477fe3876f2205cfcf9d55f7327dead5.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.
(From OE-Core rev: 62771b5a426e4b7d38e4997dc3f252a547f481ce)
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap/libpcap.inc')
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap.inc | 5 |
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" | |||
19 | inherit autotools binconfig-disabled pkgconfig bluetooth | 19 | inherit autotools binconfig-disabled pkgconfig bluetooth |
20 | 20 | ||
21 | EXTRA_OECONF = "--with-pcap=linux" | 21 | EXTRA_OECONF = "--with-pcap=linux" |
22 | EXTRA_AUTORECONF += "--exclude=aclocal" | ||
22 | 23 | ||
23 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 24 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ |
24 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 25 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ |
@@ -26,7 +27,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ | |||
26 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" | 27 | PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" |
27 | # Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. | 28 | # Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. |
28 | PACKAGECONFIG[bluez5] = ",," | 29 | PACKAGECONFIG[bluez5] = ",," |
29 | PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" | ||
30 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" | 30 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" |
31 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | 31 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," |
32 | PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" | 32 | PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" |
@@ -36,8 +36,5 @@ CFLAGS_prepend = "-I${S} " | |||
36 | CXXFLAGS_prepend = "-I${S} " | 36 | CXXFLAGS_prepend = "-I${S} " |
37 | 37 | ||
38 | do_configure_prepend () { | 38 | do_configure_prepend () { |
39 | if [ ! -e ${S}/acinclude.m4 ]; then | ||
40 | cat ${S}/aclocal.m4 > ${S}/acinclude.m4 | ||
41 | fi | ||
42 | sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in | 39 | sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in |
43 | } | 40 | } |