mirror of
https://git.yoctoproject.org/poky
synced 2026-09-29 07:36:20 +02:00
libpcap: Update to version 1.8.1
- Option --enable-canusb was removed on commit:
93ca5ff703
- 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>
This commit is contained in:
committed by
Richard Purdie
parent
ac0d917b67
commit
dd24fbfb47
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user