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

kismet: mark as not available for static builds

Browse Source 
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>
This commit is contained in:
Thomas Petazzoni 2015-07-12 16:11:20 +02:00
parent b5c763c490
commit 2af75321d2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/kismet/Config.in
View File

@ -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_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 config BR2_PACKAGE_KISMET
bool "kismet" bool "kismet"
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS # libnl depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # dlfcn.h
select BR2_PACKAGE_NCURSES select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_TARGET_PANEL select BR2_PACKAGE_NCURSES_TARGET_PANEL
select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBPCAP

4
package/kismet/kismet.mk
View File

@ -15,10 +15,6 @@ KISMET_LICENSE_FILES = debian/copyright
# We touch configure.in: # We touch configure.in:
KISMET_AUTORECONF = YES 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) ifeq ($(BR2_PACKAGE_PCRE),y)
KISMET_DEPENDENCIES += pcre KISMET_DEPENDENCIES += pcre
endif endif