Commit f472b915 authored by Daniel Mack's avatar Daniel Mack Committed by Peter Korsgaard
Browse files

kismet: fix build with new libnl-3 



The CPPFLAGS 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: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 9c4a7dc9

package/kismet/kismet-libnl-30-support.patch

+9 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Index: b/configure 
   libnl20_CFLAGS

               C compiler flags for libnl20, overriding pkg-config

   libnl20_LIBS

@@ -6760,6 +6768,75 @@

@@ -6760,6 +6768,76 @@

 	fi

 fi
@@ -103,6 +103,7 @@ Index: b/configure 
+	libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS

+	libnl30_LIBS=$pkg_cv_libnl30_LIBS

+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+	CPPFLAGS="$CPPFLAGS $libnl30_CFLAGS"

+$as_echo "yes" >&6; }

+	libnl30=yes

+fi
@@ -111,12 +112,16 @@ 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

package/kismet/kismet.mk

+1 −0
Original line number Diff line number Diff line
@@ -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