git: 8261cd9789e7 - main - devel/efl: Add an option to use luajit-openresty as LUA interpreter.
Date: Tue, 14 Jun 2022 15:24:04 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8261cd9789e735901760b1ba7f2c7327e294bd58
commit 8261cd9789e735901760b1ba7f2c7327e294bd58
Author: Volodymyr Kostyrko <arcade@b1t.name>
AuthorDate: 2022-06-14 15:19:18 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2022-06-14 15:23:55 +0000
devel/efl: Add an option to use luajit-openresty as LUA interpreter.
PR: 264313
Tested by: arrowd
---
devel/efl/Makefile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 3d61dc86552b..0bb75f4ca6e4 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -53,11 +53,12 @@ OPTIONS_GROUP_WAYLAND= WAYLAND
OPTIONS_SINGLE= CRYPTO ENGINE LUAL
OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS
OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE
-OPTIONS_SINGLE_LUAL= LUAJIT LUALANG
+OPTIONS_SINGLE_LUAL= LUAJIT LUAJIT_OR LUALANG
OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \
OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX
OPTIONS_DEFAULT_aarch64= LUALANG
-OPTIONS_EXCLUDE_aarch64= LUAJIT
+OPTIONS_EXCLUDE_aarch64= LUAJIT LUAJIT_OR
+OPTIONS_EXCLUDE_powerpc64= LUAJIT
OPTIONS_SUB= yes
HARFBUZZ_DESC= OpenType text shaping engine
@@ -74,6 +75,7 @@ HEIF_DESC= HEIF image format support
LUAL_DESC= LUA
LUALANG_DESC= Use Lua
LUAJIT_DESC= Use Luajit
+LUAJIT_OR_DESC= Use Luajit from OpenResty fork (experimental)
OPENGLES_DESC= 2D/3D rendering support via OpenGL ES
NONE_DESC= No acceleration, software only
LUA_DESC= Lua Bindings
@@ -167,11 +169,16 @@ WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
LUAJIT_BUILD_DEPENDS= luajit:lang/luajit
LUAJIT_RUN_DEPENDS= luajit:lang/luajit
LUAJIT_MESON_ON= -Dlua-interpreter=luajit
-LUAJIT_PREVENTS= LUALANG
+LUAJIT_PREVENTS= LUALANG LUAJIT_OR
+
+LUAJIT_OR_BUILD_DEPENDS= luajit:lang/luajit-openresty
+LUAJIT_OR_RUN_DEPENDS= luajit:lang/luajit-openresty
+LUAJIT_OR_MESON_ON= -Dlua-interpreter=luajit
+LUAJIT_OR_PREVENTS= LUALANG LUAJIT
LUALANG_USES= lua:51,build,run
LUALANG_MESON_ON= -Dlua-interpreter=lua
-LUALANG_PREVENTS= LUAJIT
+LUALANG_PREVENTS= LUAJIT LUAJIT_OR
OPENGL_USES= gl
OPENGL_USE= GL=gl
@@ -319,11 +326,6 @@ USE_GL= egl
LIB_DEPENDS+= libunwind.so:devel/libunwind
.endif
-.if ${ARCH:Mpowerpc64*}
-LUAJIT_BUILD_DEPENDS= luajit:lang/luajit-openresty
-LUAJIT_RUN_DEPENDS= luajit:lang/luajit-openresty
-.endif
-
post-install:
#@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
@for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \