jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 23:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

kismet: fix build with new libnl-3

Browse Source 
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: Daniel Mack <zonque@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Daniel Mack 2011-12-03 18:03:32 +01:00 committed by Peter Korsgaard
parent 9c4a7dc903
commit f472b915c0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/kismet/kismet-libnl-30-support.patch
View File

@ -35,7 +35,7 @@ Index: b/configure
libnl20_CFLAGS libnl20_CFLAGS
C compiler flags for libnl20, overriding pkg-config C compiler flags for libnl20, overriding pkg-config
libnl20_LIBS libnl20_LIBS
@@ -6760,6 +6768,75 @@ @@ -6760,6 +6768,76 @@
fi fi
fi fi
@ -103,6 +103,7 @@ Index: b/configure
+ libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS + libnl30_CFLAGS=$pkg_cv_libnl30_CFLAGS
+ libnl30_LIBS=$pkg_cv_libnl30_LIBS + libnl30_LIBS=$pkg_cv_libnl30_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ CPPFLAGS="$CPPFLAGS $libnl30_CFLAGS"
+$as_echo "yes" >&6; } +$as_echo "yes" >&6; }
+ libnl30=yes + libnl30=yes
+fi +fi
@ -111,13 +112,17 @@ Index: b/configure
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnl20" >&5
$as_echo_n "checking for libnl20... " >&6; } $as_echo_n "checking for libnl20... " >&6; }
@@ -6897,7 +6974,7 @@ @@ -6897,7 +6974,11 @@
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
libnl1=yes libnl1=yes
fi fi
- if test "$libnl20" = "yes"; then - 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 $as_echo "#define HAVE_LIBNL 1" >>confdefs.h

1
package/kismet/kismet.mk
View File

@ -10,6 +10,7 @@ KISMET_DEPENDENCIES = libpcap ncurses
ifeq ($(BR2_PACKAGE_LIBNL),y) ifeq ($(BR2_PACKAGE_LIBNL),y)
KISMET_DEPENDENCIES += libnl KISMET_DEPENDENCIES += libnl
KISMET_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/"
endif endif
ifeq ($(BR2_PACKAGE_PCRE),y) ifeq ($(BR2_PACKAGE_PCRE),y)
KISMET_DEPENDENCIES += pcre KISMET_DEPENDENCIES += pcre