summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-08-22 17:05:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:53 +0100
commit33664673f56b91433d5367a3c746ec42cec457ce (patch)
tree12bc02e3b5b9f536f19f63d4984289e7d5d2e10b
parent92ce5feca844f41b696b30f41216eef14debc271 (diff)
downloadpoky-33664673f56b91433d5367a3c746ec42cec457ce.tar.gz
libpcap: control ipv6 support based on DISTRO_FEATURES
Add PACKAGECONFIG for ipv6 and control it based on DISTRO_FEATURES. (From OE-Core rev: cfa74a2d4f158601a35b96e235484dac14cbf4d5) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index b7601b05c7..7b29a52dcd 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -20,12 +20,15 @@ inherit autotools binconfig-disabled pkgconfig bluetooth
20 20
21EXTRA_OECONF = "--with-pcap=linux" 21EXTRA_OECONF = "--with-pcap=linux"
22 22
23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
25"
24PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" 26PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
25# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. 27# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
26PACKAGECONFIG[bluez5] = ",," 28PACKAGECONFIG[bluez5] = ",,"
27PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" 29PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
28PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
29PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" 32PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
30 33
31CPPFLAGS_prepend = "-I${S} " 34CPPFLAGS_prepend = "-I${S} "