aboutsummaryrefslogtreecommitdiff
path: root/package/kismet
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-12 16:11:20 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-12 16:14:26 +0200
commit2af75321d25c515c325250ecb4476699f3bfdbc4 (patch)
tree712c08e1fbca01ec2414cc322b9205950433f946 /package/kismet
parentb5c763c490dc1ef42149468910aaaacf4710f049 (diff)
downloadbuildroot-2af75321d25c515c325250ecb4476699f3bfdbc4.tar.gz
buildroot-2af75321d25c515c325250ecb4476699f3bfdbc4.tar.bz2
kismet: mark as not available for static builds
This reverts commit a3365ebf72fc34c71e28191f107280b9d7c825a1, and marks kismet as not available for static builds. Commit a3365ebf72fc34c71e28191f107280b9d7c825a1 is indeed insufficient, since kismet uses <dlfcn.h> in two places, both in kismet_server and kismet_client. And it's fairly unlikely that kismet will be used in pure static environments, so let's not support this use case. Fixes: http://autobuild.buildroot.net/results/c24/c24e3e325df9748e9959fe79f7026d24f118dffd/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/kismet')
-rw-r--r--package/kismet/Config.in6
-rw-r--r--package/kismet/kismet.mk4
2 files changed, 4 insertions, 6 deletions
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 8bbc9a6f0e..7265c63e87 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,12 +1,14 @@
-comment "kismet needs a toolchain w/ threads, C++"
+comment "kismet needs a toolchain w/ threads, C++, dynamic library"
depends on BR2_USE_MMU
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+ BR2_STATIC_LIBS
config BR2_PACKAGE_KISMET
bool "kismet"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
depends on BR2_USE_MMU # fork()
+ depends on !BR2_STATIC_LIBS # dlfcn.h
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_TARGET_PANEL
select BR2_PACKAGE_LIBPCAP
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index 56f6247fcc..64a0ab2769 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -15,10 +15,6 @@ KISMET_LICENSE_FILES = debian/copyright
# We touch configure.in:
KISMET_AUTORECONF = YES
-ifeq ($(BR2_STATIC_LIBS),y)
-KISMET_CONF_ENV = LIBS="-lpcap $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
-endif
-
ifeq ($(BR2_PACKAGE_PCRE),y)
KISMET_DEPENDENCIES += pcre
endif