summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-07-07 21:40:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-10 17:38:33 +0100
commit6156379f91cfcd013bda2fc546cb8b197c608557 (patch)
tree12ebcc323a4961626b9fd3599f468bd94b655aa4
parentba46e51717eb1fd94b9a0a71692dd0b5d5eda7e7 (diff)
downloadpoky-6156379f91cfcd013bda2fc546cb8b197c608557.tar.gz
libpcap: fix depends on libnl
Fixed: * libnl1 -> libnl * Remove libnl from DEPENDS since we are using PACKAGECONFIG, the libnl in the DEPENDS didn't affect libpcap since the --without-libnl took effect before this patch, so it is safe to remove it. (From OE-Core rev: f8abe9fe6e3c371d07711378c0fbfb4fad7eed81) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 8a9fa9eca1..0ee7371d53 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -8,12 +8,12 @@ SECTION = "libs/network"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \ 9LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" 10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
11DEPENDS = "flex-native bison-native libnl" 11DEPENDS = "flex-native bison-native"
12 12
13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" 14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" 15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
16PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1" 16PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
17 17
18INC_PR = "r5" 18INC_PR = "r5"
19 19