Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/luajit: depend on !BR2_PACKAGE_LUA
@ 2022-05-03  1:17 James Hilliard
  2022-05-03 20:27 ` Arnout Vandecappelle
  2022-05-28  8:33 ` Peter Korsgaard
  0 siblings, 2 replies; 4+ messages in thread
From: James Hilliard @ 2022-05-03  1:17 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard, Fabrice Fontaine

We can't enable lua and luajit at the same time as they both provide
the virtual luainterpreter package.

Fixes:
package/luajit/luajit.mk:80: *** Configuration error: both "luajit" and "lua" are selected as providers for virtual package "luainterpreter". Only one provider can be selected at a time. Please fix your configuration.  Stop.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/luajit/Config.in | 2 ++
 package/snort3/Config.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index 3111a2548f..f27099e80c 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -14,6 +14,8 @@ config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 config BR2_PACKAGE_LUAJIT
 	bool "luajit"
 	depends on !BR2_STATIC_LIBS # dlopen
+	# Luajit conflicts with the regular lua package
+	depends on !BR2_PACKAGE_LUA
 	# 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
diff --git a/package/snort3/Config.in b/package/snort3/Config.in
index dcc29b820a..9b96e7cb58 100644
--- a/package/snort3/Config.in
+++ b/package/snort3/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SNORT3
 	bool "snort3"
+	depends on !BR2_PACKAGE_LUA # luajit
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit
 	depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT)
 	depends on BR2_USE_MMU # fork()
@@ -34,6 +35,7 @@ config BR2_PACKAGE_SNORT3
 	  https://www.snort.org/snort3
 
 comment "snort3 needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.9"
+	depends on !BR2_PACKAGE_LUA
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	depends on !(BR2_PACKAGE_DAQ || BR2_PACKAGE_SNORT)
 	depends on BR2_USE_MMU
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/luajit: depend on !BR2_PACKAGE_LUA
@ 2020-05-23  9:14 James Hilliard
  0 siblings, 0 replies; 4+ messages in thread
From: James Hilliard @ 2020-05-23  9:14 UTC (permalink / raw)
  To: buildroot

The luajit package is incomaptible with lua so luajit should depend on
!BR2_PACKAGE_LUA, propagate this dependency to packages selecting
luajit.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/efl/Config.in      | 1 +
 package/luajit/Config.in   | 1 +
 package/minetest/Config.in | 1 +
 package/solarus/Config.in  | 1 +
 package/sysdig/Config.in   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/package/efl/Config.in b/package/efl/Config.in
index ff49161163..c63633ffe4 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EFL
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit
+	depends on !BR2_PACKAGE_LUA # luajit
 	depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
 	depends on BR2_USE_MMU
 	depends on BR2_USE_WCHAR # use wchar_t
diff --git a/package/luajit/Config.in b/package/luajit/Config.in
index f4d6001586..bb471b46b0 100644
--- a/package/luajit/Config.in
+++ b/package/luajit/Config.in
@@ -15,6 +15,7 @@ config BR2_PACKAGE_LUAJIT
 	# 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
+	depends on !BR2_PACKAGE_LUA
 	# luajit.mk uses the "-m32" compiler option to build 32bit
 	# binaries, so check if that option is supported. See
 	# luajit.mk for details.
diff --git a/package/minetest/Config.in b/package/minetest/Config.in
index 085525534d..880122ea84 100644
--- a/package/minetest/Config.in
+++ b/package/minetest/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_MINETEST
 	depends on BR2_PACKAGE_XORG7 # irrlicht
 	depends on BR2_PACKAGE_HAS_LIBGL # irrlicht
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_LUA # luajit
 	select BR2_PACKAGE_IRRLICHT
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_JSONCPP
diff --git a/package/solarus/Config.in b/package/solarus/Config.in
index 5d15342f3a..f18f5a7963 100644
--- a/package/solarus/Config.in
+++ b/package/solarus/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_SOLARUS
 	bool "solarus"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_LUA # luajit
 	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in
index 0a1b3f8935..f2d2595a99 100644
--- a/package/sysdig/Config.in
+++ b/package/sysdig/Config.in
@@ -3,6 +3,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_PACKAGE_LUA # luajit
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on !BR2_STATIC_LIBS # luajit, elfutils
 	depends on BR2_USE_WCHAR # elfutils
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-05-28  8:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-03  1:17 [Buildroot] [PATCH 1/1] package/luajit: depend on !BR2_PACKAGE_LUA James Hilliard
2022-05-03 20:27 ` Arnout Vandecappelle
2022-05-28  8:33 ` Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2020-05-23  9:14 James Hilliard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox