]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/luajit: disable for static build
authorJörg Krause <joerg.krause@embedded.rocks>
Fri, 17 Jul 2015 12:46:37 +0000 (14:46 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 18 Jul 2015 19:06:02 +0000 (21:06 +0200)
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>
package/luajit/Config.in
package/sysdig/Config.in

index f6995e22f3921bbddc7d6714a47f5392a9c6f8fa..8ce528b2cf27a2b9b76a8675b0956bdd5a38186b 100644 (file)
@@ -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
index 3d7ee678794838036ad702d86373238a358d898e..36d35fb7ac4293b10e4b3cd0bdb761b3d8188350 100644 (file)
@@ -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