From patchwork Sun Jun 9 09:45:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 250018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 82C9A2C02B9 for ; Sun, 9 Jun 2013 19:46:03 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3EAFA8BCB6; Sun, 9 Jun 2013 09:46:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xPCy6RTl8BDu; Sun, 9 Jun 2013 09:45:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5490D8BADB; Sun, 9 Jun 2013 09:45:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id ED28E8F753 for ; Sun, 9 Jun 2013 09:46:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E469101EB6 for ; Sun, 9 Jun 2013 09:45:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oyhF0CpPOkpx for ; Sun, 9 Jun 2013 09:45:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by fraxinus.osuosl.org (Postfix) with ESMTP id D862E10BAE7 for ; Sun, 9 Jun 2013 09:45:40 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id A22027FA; Sun, 9 Jun 2013 11:45:39 +0200 (CEST) Received: from localhost (AToulouse-651-1-76-8.w92-156.abo.wanadoo.fr [92.156.131.8]) by mail.free-electrons.com (Postfix) with ESMTPSA id 1E3B1759 for ; Sun, 9 Jun 2013 11:45:39 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 9 Jun 2013 11:45:36 +0200 Message-Id: <1370771136-1443-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] libpcap: fix build failure related to libnl3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 Acked-by: Gustavo Zacarias --- .../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 diff --git a/package/libpcap/libpcap-remove-libnl-include-path.patch b/package/libpcap/libpcap-remove-libnl-include-path.patch new file mode 100644 index 0000000..7b7106b --- /dev/null +++ b/package/libpcap/libpcap-remove-libnl-include-path.patch @@ -0,0 +1,16 @@ +Remove hardcoded path to libnl3 include directory + +Signed-off-by: Thomas Petazzoni + +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" + ]) + diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index bbbecdc..ec4d346 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -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))