aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Jörg Krause <joerg.krause@embedded.rocks>2015-07-17 14:46:37 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-07-18 21:06:02 +0200
commitb2e8f28efac7125a6a8cf1db9087b3710101b487 (patch)
tree95795f3112ade220a1ace3dee35b7c16385e1772 /package
parent6c7d490558498888a783fe3ca53f1a3b6cef1b16 (diff)
downloadbuildroot-b2e8f28efac7125a6a8cf1db9087b3710101b487.tar.gz
buildroot-b2e8f28efac7125a6a8cf1db9087b3710101b487.tar.bz2
package/luajit: disable for static build
luajit requires dlopen(). Fixes: http://autobuild.buildroot.net/results/20d/20dfb10198f3688f92208591960192ca08280987/ http://autobuild.buildroot.net/results/c3c/c3cfdf8dfb315bf64caa9ed0f362016111fd93ac/ http://autobuild.buildroot.net/results/8cb/8cbf6207ecf7b254aeccd9ec5c07376a044e1f8f/ [Thomas: propagate the new dependency to the sysdig package, which selects luajit.] Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/luajit/Config.in4
-rw-r--r--package/sysdig/Config.in5
2 files changed, 7 insertions, 2 deletions
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index f6995e22f3..8ce528b2cf 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
config BR2_PACKAGE_LUAJIT
bool "luajit"
select BR2_PACKAGE_HAS_LUAINTERPRETER
+ depends on !BR2_STATIC_LIBS # dlopen
# Luajit is only available for some target architectures, and
# has some complexity wrt 32/64. See luajit.mk for details.
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
@@ -32,3 +33,6 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION
default "5.1"
endif
+
+comment "luajit needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in
index 3d7ee67879..36d35fb7ac 100644
--- a/package/sysdig/Config.in
+++ b/package/sysdig/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_SYSDIG
depends on BR2_LINUX_KERNEL
depends on BR2_INSTALL_LIBSTDCPP # libjson
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+ depends on !BR2_STATIC_LIBS # luajit
help
Sysdig is open source, system-level exploration:
capture system state and activity from a running Linux instance,
@@ -15,6 +16,6 @@ config BR2_PACKAGE_SYSDIG
http://sysdig.org
-comment "sysdig needs a toolchain w/ C++ and a Linux kernel to be built"
- depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP
+comment "sysdig needs a toolchain w/ C++, dynamibc library and a Linux kernel to be built"
+ depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS