summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-04-06 18:13:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-10 17:10:26 (GMT)
commit6cbfe0f354a62dbd9252c58a0af24bec68dfeb5f (patch)
treeb81607e989215e12a66bbc8ce69143f8f4b1aba2 /meta/recipes-connectivity/libpcap
parentddb122fa9a69a8c61d78b0034ad82376b6d2e4ce (diff)
downloadpoky-6cbfe0f354a62dbd9252c58a0af24bec68dfeb5f.tar.gz
libpcap.inc: consolidate inherit and PACKAGECONFIG lines
(From OE-Core rev: ce9fa5588acdf56e32bbdf9da512aa4071cf7266) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc14
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 6f2c985..9b059d7 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,25 +10,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" 10 file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
11DEPENDS = "flex-native bison-native" 11DEPENDS = "flex-native bison-native"
12 12
13inherit bluetooth pkgconfig
14
15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
16PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
17PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
18PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
19
20INC_PR = "r5" 13INC_PR = "r5"
21 14
22SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz" 15SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
23 16
24BINCONFIG = "${bindir}/pcap-config" 17BINCONFIG = "${bindir}/pcap-config"
25 18
26inherit autotools binconfig-disabled 19inherit autotools binconfig-disabled pkgconfig bluetooth
27 20
28EXTRA_OECONF = "--with-pcap=linux" 21EXTRA_OECONF = "--with-pcap=linux"
29 22
30PACKAGECONFIG ??= "" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
24PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
25PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
31PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 26PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
27PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
32 28
33CPPFLAGS_prepend = "-I${S} " 29CPPFLAGS_prepend = "-I${S} "
34CFLAGS_prepend = "-I${S} " 30CFLAGS_prepend = "-I${S} "