jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

libpcap: fix build failure related to libnl3

Browse Source 
When libpcap detects that libnl3 is available, it hardcodes the fact
of using -I/usr/include/libnl3, which is completely wrong in
cross-compilation.

This commit fixes that, by removing this hardcoded include path, and
by passing an appropriate -I option from libpcap.mk.

The original issue has been reported upstream at
https://github.com/the-tcpdump-group/libpcap/issues/305.

Fixes:

  http://autobuild.buildroot.net/results/b65/b6585bf2985a188e797e5a6b71a35c461421e3b4/build-end.log

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2013-06-08 23:45:36 +00:00 committed by Peter Korsgaard
parent 69e3d032ed
commit 205643a345
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/libpcap/libpcap-remove-libnl-include-path.patch Normal file
View File

@ -0,0 +1,16 @@
Remove hardcoded path to libnl3 include directory
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/configure.in
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -445,7 +445,6 @@
AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
- V_INCLS="$V_INCLS -I/usr/include/libnl3"
have_any_nl="yes"
])

19
package/libpcap/libpcap.mk
View File

@ -9,10 +9,14 @@ LIBPCAP_SITE = http://www.tcpdump.org/release
LIBPCAP_LICENSE = BSD-3c LIBPCAP_LICENSE = BSD-3c
LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_LICENSE_FILES = LICENSE
LIBPCAP_INSTALL_STAGING = YES LIBPCAP_INSTALL_STAGING = YES
LIBPCAP_DEPENDENCIES = zlib host-flex host-bison \ LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
$(if $(BR2_PACKAGE_LIBNL),libnl)
# We're patching configure.in
LIBPCAP_AUTORECONF = YES
LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \ LIBPCAP_CONF_ENV = ac_cv_linux_vers=2 \
ac_cv_header_linux_wireless_h=yes # configure misdetects this ac_cv_header_linux_wireless_h=yes \
CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
LIBPCAP_CONFIG_SCRIPTS = pcap-config LIBPCAP_CONFIG_SCRIPTS = pcap-config
@ -23,9 +27,16 @@ else
LIBPCAP_CONF_OPT += --disable-canusb LIBPCAP_CONF_OPT += --disable-canusb
endif endif
ifeq ($(BR2_PACKAGE_LIBNL),y)
LIBPCAP_DEPENDENCIES += libnl
LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"
else
LIBPCAP_CONF_OPT += --without-libnl
endif
# microblaze needs -fPIC instead of -fpic # microblaze needs -fPIC instead of -fpic
ifeq ($(BR2_microblaze),y) ifeq ($(BR2_microblaze),y)
LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC" LIBPCAP_CFLAGS += -fPIC
endif endif
$(eval $(autotools-package)) $(eval $(autotools-package))