From ce9fa5588acdf56e32bbdf9da512aa4071cf7266 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 6 Apr 2015 11:13:21 -0700 Subject: libpcap.inc: consolidate inherit and PACKAGECONFIG lines Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- meta/recipes-connectivity/libpcap/libpcap.inc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'meta/recipes-connectivity/libpcap') diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 6f2c9854b7..9b059d7df6 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 \ file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" DEPENDS = "flex-native bison-native" -inherit bluetooth pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" -PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" -PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" -PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" - INC_PR = "r5" SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz" BINCONFIG = "${bindir}/pcap-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled pkgconfig bluetooth EXTRA_OECONF = "--with-pcap=linux" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" +PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" +PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" +PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" CPPFLAGS_prepend = "-I${S} " CFLAGS_prepend = "-I${S} " -- cgit 1.2.3-korg