From: Daniel Mack <zonque@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] kismet: fix build with new libnl-3
Date: Wed, 30 Nov 2011 16:06:00 +0100 [thread overview]
Message-ID: <1322665560-29888-2-git-send-email-zonque@gmail.com> (raw)
In-Reply-To: <1322665560-29888-1-git-send-email-zonque@gmail.com>
The CFLAGS have to be augmented, so configure finds the correct include
dir, and the patch needs to be tweaked to make the binary link to
libnl-3 instead of libnl-gen.
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
package/kismet/kismet-libnl-30-support.patch | 10 +++++++---
package/kismet/kismet.mk | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/kismet/kismet-libnl-30-support.patch b/package/kismet/kismet-libnl-30-support.patch
index cf3c845..5100a69 100644
--- a/package/kismet/kismet-libnl-30-support.patch
+++ b/package/kismet/kismet-libnl-30-support.patch
@@ -111,13 +111,17 @@ Index: b/configure
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
$as_echo_n "checking for libnl20... " >&6; }
-@@ -6897,7 +6974,7 @@
+@@ -6897,7 +6974,11 @@
$as_echo "yes" >&6; }
libnl1=yes
fi
- if test "$libnl20" = "yes"; then
-+ if test "$libnl20" = "yes" -o "$libnl30" = "yes"; then
-
++ if test "$libnl30" = "yes"; then
++$as_echo "#define HAVE_LIBNL 1" >>confdefs.h
++$as_echo "#define HAVE_LIBNL20 1" >>confdefs.h
++ NLLIBS="-lnl-genl-3 -lnl-3"
++ elif test "$libnl20" = "yes"; then
+
$as_echo "#define HAVE_LIBNL 1" >>confdefs.h
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 4c7d6e2..854c9dd 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -10,6 +10,7 @@ KISMET_DEPENDENCIES = libpcap ncurses
ifeq ($(BR2_PACKAGE_LIBNL),y)
KISMET_DEPENDENCIES += libnl
+ KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/"
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
KISMET_DEPENDENCIES += pcre
--
1.7.7.3
next prev parent reply other threads:[~2011-11-30 15:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-29 16:27 [Buildroot] [PATCH] libnl: bump to version 3.2.3 Daniel Mack
2011-11-29 18:16 ` [Buildroot] [PATCH] hostapd: fix build with new libnl-3 Daniel Mack
2011-11-29 18:27 ` Daniel Mack
2011-11-29 18:24 ` [Buildroot] [PATCH] wpa_supplicant: " Daniel Mack
2011-11-29 21:26 ` [Buildroot] [PATCH] libnl: bump to version 3.2.3 Yegor Yefremov
2011-11-29 21:28 ` Yegor Yefremov
2011-11-30 15:05 ` [Buildroot] [PATCH 1/2] iw: fix build with new libnl-3 Daniel Mack
2011-11-30 15:06 ` Daniel Mack [this message]
2011-11-30 15:54 ` Yegor Yefremov
2011-11-30 16:31 ` Daniel Mack
2011-11-30 16:36 ` Michael S. Zick
2011-11-30 16:41 ` Michael S. Zick
2011-11-30 21:31 ` Yegor Yefremov
2011-12-01 11:50 ` Daniel Mack
2011-12-24 15:24 ` Peter Korsgaard
2011-12-24 15:56 ` Stephan Hoffmann
2011-11-30 15:06 ` [Buildroot] [PATCH] libnl: bump to version 3.2.3 Daniel Mack
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322665560-29888-2-git-send-email-zonque@gmail.com \
--to=zonque@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.