pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

efl: enable building on aarch64.



Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Sat Nov 27 17:03:01 2021 +0000
Changeset:	d5bb17e9cae28a55df599b48e9d5c24c8d2d0452

Modified Files:
	efl/Makefile
	efl/buildlink3.mk

Log Message:
efl: enable building on aarch64.

This replaces LuaJIT (which is only available on some archs) with
regular Lua.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d5bb17e9cae28a55df599b48e9d5c24c8d2d0452

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 efl/Makefile      | 6 ++++--
 efl/buildlink3.mk | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/efl/Makefile b/efl/Makefile
index 0abfb6ef4f..b9fd7bb1cb 100644
--- a/efl/Makefile
+++ b/efl/Makefile
@@ -70,7 +70,8 @@ SUBST_STAGE.fix-options=	pre-configure
 SUBST_FILES.fix-options=	meson_options.txt
 SUBST_SED.fix-options=		-e "s|'es-egl', 'none'|'es-egl', 'base', 'none'|g"
 
-MESON_ARGS+=	-Dopengl=base
+MESON_ARGS+=	-Dopengl=base -Dlua-interpreter=lua
+LUA_VERSIONS_ACCEPTED=		52 51
 
 .else
 
@@ -92,7 +93,8 @@ MESON_ARGS+=	-Dopengl=base
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../inputmethod/scim/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
+#.include "../../lang/LuaJIT2/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
diff --git a/efl/buildlink3.mk b/efl/buildlink3.mk
index 695824a7a5..523ed0acbb 100644
--- a/efl/buildlink3.mk
+++ b/efl/buildlink3.mk
@@ -8,6 +8,8 @@ EFL_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.efl+=	efl>=1.25.0
 BUILDLINK_PKGSRCDIR.efl?=	../../wip/efl
 
+LUA_VERSIONS_ACCEPTED= 52 51
+
 pkgbase := efl
 .include "../../mk/pkg-build-options.mk"
 
@@ -39,7 +41,7 @@ pkgbase := efl
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../inputmethod/scim/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"


Home | Main Index | Thread Index | Old Index