aboutsummaryrefslogtreecommitdiff
path: root/package/kismet
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2014-12-26 22:08:00 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-27 11:29:04 +0100
commit8b966c934db6b482fbba4c65cdbc49d1b19b5212 (patch)
treea1d97ccde3b76f224dc20e3a6b2ba5924803a76e /package/kismet
parent21d6e4ea459b0b3a436c7936a94a917f085919e6 (diff)
downloadbuildroot-8b966c934db6b482fbba4c65cdbc49d1b19b5212.tar.gz
buildroot-8b966c934db6b482fbba4c65cdbc49d1b19b5212.tar.bz2
package/kismet: fix ncurses static build
Says Vicente: [T]he order is very important when doing static builds. Otherwise we will see errors like this one: [...]/sysroot/usr/lib/libpanel.a(p_delete.o): In function `del_panel': p_delete.c:(.text+0x68): undefined reference to `_nc_panelhook' Fix the order configure adds libraries: new libraries should be added at the *front* of the list, not at the end. Reported-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/kismet')
-rw-r--r--package/kismet/0003-fix-curses-libs-ordering.patch42
-rw-r--r--package/kismet/kismet.mk3
2 files changed, 45 insertions, 0 deletions
diff --git a/package/kismet/0003-fix-curses-libs-ordering.patch b/package/kismet/0003-fix-curses-libs-ordering.patch
new file mode 100644
index 0000000000..b579c96d46
--- /dev/null
+++ b/package/kismet/0003-fix-curses-libs-ordering.patch
@@ -0,0 +1,42 @@
+configure: fix ordering of ncurses libraries
+
+Says Vicente:
+ [T]he order is very important when doing static builds.
+ Otherwise we will see errors like this one:
+
+ [...]/sysroot/usr/lib/libpanel.a(p_delete.o):
+ In function `del_panel':
+ p_delete.c:(.text+0x68): undefined reference to `_nc_panelhook'
+
+Fix the order configure adds libraries: new libraries should be added
+at the *front* of the list, not at the end.
+
+Reported-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in
+--- kismet-Kismet-2014-02-R1.orig/configure.in 2014-02-19 05:37:43.000000000 +0100
++++ kismet-Kismet-2014-02-R1/configure.in 2014-12-26 16:46:55.770692349 +0100
+@@ -437,10 +434,10 @@
+ AC_MSG_ERROR(Failed to find curses.h or ncurses.h. You probably need to install the curses-devel package from your distribution)
+ fi
+
+- LIBS="$LIBS $curseaux"
++ LIBS="$curseaux $LIBS"
+ AC_CHECK_LIB([panel], [new_panel],
+ AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib)
+- curseaux="$curseaux -lpanel",
++ curseaux="-lpanel $curseaux",
+ AC_MSG_ERROR(Failed to find libpanel extension to curses/ncurses. Install it, or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.))
+
+ AC_CHECK_HEADER([panel.h], [foundhpanel=yes])
+@@ -450,7 +447,7 @@
+
+ LIBS="$OLIBS"
+
+- CLIENTCLIBS="$CLIENTCLIBS $curseaux"
++ CLIENTCLIBS="$curseaux $CLIENTCLIBS"
+ fi
+
+ AC_SUBST(CLIBS)
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index f177fea2da..a71414ed0e 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -12,6 +12,9 @@ KISMET_CONF_OPTS += --with-netlink-version=3
KISMET_LICENSE = GPLv2+
KISMET_LICENSE_FILES = debian/copyright
+# We touch configure.in:
+KISMET_AUTORECONF = YES
+
ifeq ($(BR2_PACKAGE_PCRE),y)
KISMET_DEPENDENCIES += pcre
endif