Skip to contentSkip to conversation

libpcap: fix build failure related to libnl3

PATCH New Thomas Petazzoni 3 participants 3 messages Jun 9, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libpcap: fix build failure related to libnl3

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

---
 .../libpcap/libpcap-remove-libnl-include-path.patch   | 16 ++++++++++++++++
 package/libpcap/libpcap.mk                            | 19 +++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 package/libpcap/libpcap-remove-libnl-include-path.patch
package/libpcap/libpcap-remove-libnl-include-path.patch new file +16 -0
new file mode 100644
index 0000000..7b7106b
@@ -0,0 +1,16 @@
+Remove hardcoded path to libnl3 include directory
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+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"
+ 		])
+ 
package/libpcap/libpcap.mk +15 -4
index bbbecdc..ec4d346 100644
@@ -9,10 +9,14 @@ LIBPCAP_SITE = http://www.tcpdump.org/release
 LIBPCAP_LICENSE = BSD-3c
 LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
-LIBPCAP_DEPENDENCIES = zlib host-flex host-bison \
-	$(if $(BR2_PACKAGE_LIBNL),libnl)
+LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
+
+# We're patching configure.in
+LIBPCAP_AUTORECONF = YES
 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_CONFIG_SCRIPTS = pcap-config
 
@@ -23,9 +27,16 @@ else
 LIBPCAP_CONF_OPT += --disable-canusb
 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
 ifeq ($(BR2_microblaze),y)
-LIBPCAP_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
+LIBPCAP_CFLAGS += -fPIC
 endif
 
 $(eval $(autotools-package))
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 libpcap: fix build failure related to libnl3

Quoted 7 lines · Thomas Petazzoni

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.

Quoted 8 lines

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

On a gentoo host (desktop) there are plenty of headers hence this went unnoticed by myself.

#2 lore raw

PATCH 1/1 libpcap: fix build failure related to libnl3

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

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

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

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

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard