Date: Tue, 14 Jun 2022 17:39:41 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Gleb Popov <arrowd@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 8261cd9789e7 - main - devel/efl: Add an option to use luajit-openresty as LUA interpreter. Message-ID: <YqirvRCQDGwsqKcR@KGPE-D16> In-Reply-To: <202206141524.25EFO4J3030436@gitrepo.freebsd.org> References: <202206141524.25EFO4J3030436@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--qFoMJboyxUe3MUk2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This is wrong since it misses powerpc64le. It should also make LUAJIT_OR the default on both powerpc64 and powerpc64le. On 22-06-14 15:24:04, Gleb Popov wrote: > The branch main has been updated by arrowd: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D8261cd9789e735901760b1ba= 7f2c7327e294bd58 >=20 > 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 >=20 > devel/efl: Add an option to use luajit-openresty as LUA interpreter. > =20 > PR: 264313 > Tested by: arrowd > --- > devel/efl/Makefile | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) >=20 > 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=3D WAYLAND > OPTIONS_SINGLE=3D CRYPTO ENGINE LUAL > OPTIONS_SINGLE_CRYPTO=3D OPENSSL GNUTLS > OPTIONS_SINGLE_ENGINE=3D OPENGL OPENGLES NONE > -OPTIONS_SINGLE_LUAL=3D LUAJIT LUALANG > +OPTIONS_SINGLE_LUAL=3D LUAJIT LUAJIT_OR LUALANG > OPTIONS_DEFAULT=3D FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SC= IM XIM \ > OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX > OPTIONS_DEFAULT_aarch64=3D LUALANG > -OPTIONS_EXCLUDE_aarch64=3D LUAJIT > +OPTIONS_EXCLUDE_aarch64=3D LUAJIT LUAJIT_OR > +OPTIONS_EXCLUDE_powerpc64=3D LUAJIT > OPTIONS_SUB=3D yes > =20 > HARFBUZZ_DESC=3D OpenType text shaping engine > @@ -74,6 +75,7 @@ HEIF_DESC=3D HEIF image format support > LUAL_DESC=3D LUA > LUALANG_DESC=3D Use Lua > LUAJIT_DESC=3D Use Luajit > +LUAJIT_OR_DESC=3D Use Luajit from OpenResty fork (experimental) > OPENGLES_DESC=3D 2D/3D rendering support via OpenGL ES > NONE_DESC=3D No acceleration, software only > LUA_DESC=3D Lua Bindings > @@ -167,11 +169,16 @@ WEBP_LIB_DEPENDS=3D libwebp.so:graphics/webp > LUAJIT_BUILD_DEPENDS=3D luajit:lang/luajit > LUAJIT_RUN_DEPENDS=3D luajit:lang/luajit > LUAJIT_MESON_ON=3D -Dlua-interpreter=3Dluajit > -LUAJIT_PREVENTS=3D LUALANG > +LUAJIT_PREVENTS=3D LUALANG LUAJIT_OR > + > +LUAJIT_OR_BUILD_DEPENDS=3D luajit:lang/luajit-openresty > +LUAJIT_OR_RUN_DEPENDS=3D luajit:lang/luajit-openresty > +LUAJIT_OR_MESON_ON=3D -Dlua-interpreter=3Dluajit > +LUAJIT_OR_PREVENTS=3D LUALANG LUAJIT > =20 > LUALANG_USES=3D lua:51,build,run > LUALANG_MESON_ON=3D -Dlua-interpreter=3Dlua > -LUALANG_PREVENTS=3D LUAJIT > +LUALANG_PREVENTS=3D LUAJIT LUAJIT_OR > =20 > OPENGL_USES=3D gl > OPENGL_USE=3D GL=3Dgl > @@ -319,11 +326,6 @@ USE_GL=3D egl > LIB_DEPENDS+=3D libunwind.so:devel/libunwind > .endif > =20 > -.if ${ARCH:Mpowerpc64*} > -LUAJIT_BUILD_DEPENDS=3D luajit:lang/luajit-openresty > -LUAJIT_RUN_DEPENDS=3D luajit:lang/luajit-openresty > -.endif > - > post-install: > #@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb > @for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -t= ype f`; do \ --qFoMJboyxUe3MUk2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmKoq70ACgkQelmbhSCD nJ2fKQ//ZfjMCbC7JwRnz6PfIRBNbxWR26bf5FNEG09YE1eNG+Q6XD5Zpd7cwm15 e+LMCMDdPAU9BhdZq63QM4LQIW20kgRMVfpSC/vSbtXR3Fzfp9OoAxRIaFpeKL3N AyDvE8kZ+EcKmFwHW2vXzUCoh1QjTmDDQ3Ur4J55j7PY0kG6MMJxmMmQ9S33ZwHr KgFAzwvnFLJyRwB9q32DQNr2LIYDePDlw+GXlNKdvmIsA/JUGymMH4PZzLMeL59u DMrkz3NMswP3sPbKQazbLASHaV7v+35/1YMR3xhqKPyBrOHSVv1auDF3YLuTos8/ mzPhayrIZlRNw4Gqa83bcf1B76Y1JJAYpSuaKg0isR4X/wYYk8AU1+0M8ZZmrPAL SWLwa7y/VR98JjrDU/UyitRnnAqaQk8rN1RW1zjuaYR/kY+oXuWkzrVEFgpkCAzn KyAAawXMZ5Rzma5/je/ivpJPhNPE5eKJjZa3Yp1YIogP2wEkHPgd5xOj/GsiDRhx 0kTVDfCGQs+n56Kna83vxoplHUywobkOSdk3ILjWCv8A/9l05sF67S0ETmzkYjSX /K80aB4v3BH4LWi9rgEj5dkQTwN6rvERnwqTkJeZ+LEsreSQQhJhftMp9C1wc1px /wcChD4FJI+EH1mOUroP5nkKRkEUnwZtGKLV+duDs4qpLiZt2pA= =z7r7 -----END PGP SIGNATURE----- --qFoMJboyxUe3MUk2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YqirvRCQDGwsqKcR>