Date: Thu, 2 Dec 2021 13:57:00 -0700 From: Adam Weinberger <adamw@adamw.org> To: Dima Panov <fluffy@freebsd.org> Cc: dev-commits-ports-all@freebsd.org, ports-committers@freebsd.org, dev-commits-ports-main@freebsd.org, Adam Weinberger <adamw@freebsd.org> Subject: Re: git: a2f29f52f700 - main - editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 Message-ID: <B355183F-24CA-4154-B9FB-4102222F578F@adamw.org> In-Reply-To: <0aae2691-9f22-44da-8609-87a9f8b0620c@Canary> References: <0aae2691-9f22-44da-8609-87a9f8b0620c@Canary>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-1BCC018D-4C29-4B4D-A6AF-0EDDE1BECDED Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable I=E2=80=99m a few hours from home. Please, commit it if you=E2=80=99d like! # Adam =E2=80=94 Adam Weinberger adamw@adamw.org https://www.adamw.org > On Dec 2, 2021, at 11:30, Dima Panov <fluffy@freebsd.org> wrote: >=20 > =EF=BB=BF =20 > Moin! >=20 >=20 > Please fore lua52 for the build with luajit.=20 >=20 > Neovim is unable to build with lua53+ as default >=20 >=20 > diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile > index 1888e9cfa09f..0a0429fe5453 100644 > --- a/editors/neovim/Makefile > +++ b/editors/neovim/Makefile > @@ -52,7 +52,7 @@ PYNVIM_DESC=3D Enable support for plugins written in py= thon >=20 > LUAJIT_CMAKE_OFF=3D -DPREFER_LUA:BOOL=3D"ON" > LUAJIT_LIB_DEPENDS=3D libluajit-5.1.so:lang/luajit > -LUAJIT_USES=3D lua:build > +LUAJIT_USES=3D lua:52,build > LUAJIT_USES_OFF=3D lua:52 > NLS_CMAKE_BOOL=3D ENABLE_LIBINTL > NLS_USES=3D gettext >=20 >=20 > -- > Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team > (fluffy@FreeBSD.org, https://t.me/dima_panov) >=20 > On Thursday, Dec 02, 2021 at 7:46 PM, Adam Weinberger <adamw@FreeBSD.org> w= rote: > The branch main has been updated by adamw:=20 >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Da2f29f52f70007ef491672e59= a2d110ae2fc5218=20 >=20 > commit a2f29f52f70007ef491672e59a2d110ae2fc5218=20 > Author: Adam Weinberger <adamw@FreeBSD.org>=20 > AuthorDate: 2021-12-02 16:41:57 +0000=20 > Commit: Adam Weinberger <adamw@FreeBSD.org>=20 > CommitDate: 2021-12-02 16:41:57 +0000=20 >=20 > editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976=20= >=20 > luajit-openresty causes lua errors with many nvim plugins. I don't know=20= > why, and until I have time to diagnose it, revert the switch to=20 > hardcoded luajit-openresty. In the short term I'll likely switch to=20 > hardcoding luajit and removing the PUC Lua option.=20 > ---=20 > devel/luv/Makefile | 26 +++++++++++++++++++++-----=20 > editors/neovim/Makefile | 19 +++++++++++++++----=20 > 2 files changed, 36 insertions(+), 9 deletions(-)=20 >=20 > diff --git a/devel/luv/Makefile b/devel/luv/Makefile=20 > index d4823eb8b3a1..cba39bbd4659 100644=20 > --- a/devel/luv/Makefile=20 > +++ b/devel/luv/Makefile=20 > @@ -1,6 +1,6 @@=20 > PORTNAME=3D luv=20 > DISTVERSION=3D 1.41.0-0=20 > -PORTREVISION=3D 1=20 > +PORTREVISION=3D 2=20 > CATEGORIES=3D devel=20 >=20 > MAINTAINER=3D checo1705@secmail.pro=20 > @@ -9,8 +9,7 @@ COMMENT=3D libuv bindings for lua=20 > LICENSE=3D APACHE20=20 > LICENSE_FILE=3D ${WRKSRC}/LICENSE.txt=20 >=20 > -LIB_DEPENDS=3D libuv.so:devel/libuv \=20 > - libluajit-5.1.so:lang/luajit-openresty \=20 > +LIB_DEPENDS=3D libuv.so:devel/libuv=20 >=20 > USES=3D cmake=20 > USE_LDCONFIG=3D yes=20 > @@ -20,9 +19,26 @@ GH_PROJECT=3D luv lua-compat-5.3:compat=20 > GH_TAGNAME=3D bc91f40:compat=20 > GH_SUBDIR=3D deps/lua-compat-5.3:compat=20 >=20 > -OPTIONS_DEFINE=3D DOCS EXAMPLES=20 > +OPTIONS_DEFINE=3D DOCS EXAMPLES LUAJIT=20 > +OPTIONS_DEFAULT_aarch64=3D LUAJIT=20 > +OPTIONS_DEFAULT_amd64=3D LUAJIT=20 > +OPTIONS_DEFAULT_i386=3D LUAJIT=20 > +OPTIONS_DEFAULT_powerpc=3D LUAJIT=20 > +OPTIONS_DEFAULT_powerpc64=3D LUAJIT=20 > +OPTIONS_DEFAULT_powerpc64le=3D LUAJIT=20 >=20 > -CMAKE_ON=3D BUILD_SHARED_LIBS WITH_LUA_ENGINE=3DLuaJIT WITH_SHARED_LIBUV=20= > +LUAJIT_DESC=3D Use LuaJIT (instead of just Lua; recommended)=20 > +LUAJIT_LIB_DEPENDS=3D ${LUAJIT_LIB_DEPENDS_${ARCH}}=20 > +LUAJIT_LIB_DEPENDS_aarch64=3D libluajit-5.1.so:lang/luajit-openresty=20 > +LUAJIT_LIB_DEPENDS_amd64=3D libluajit-5.1.so:lang/luajit=20 > +LUAJIT_LIB_DEPENDS_i386=3D libluajit-5.1.so:lang/luajit=20 > +LUAJIT_LIB_DEPENDS_powerpc=3D libluajit-5.1.so:lang/luajit=20 > +LUAJIT_LIB_DEPENDS_powerpc64=3D libluajit-5.1.so:lang/luajit-openresty=20= > +LUAJIT_LIB_DEPENDS_powerpc64le=3D libluajit-5.1.so:lang/luajit-openresty=20= > +LUAJIT_CMAKE_ON=3D -DWITH_LUA_ENGINE=3DLuaJIT=20 > +LUAJIT_CMAKE_OFF=3D -DWITH_LUA_ENGINE=3DLua=20 > +LUAJIT_USES_OFF=3D lua=20 > +CMAKE_ON=3D BUILD_SHARED_LIBS WITH_SHARED_LIBUV=20 > CMAKE_OFF=3D BUILD_MODULE=20 > CMAKE_ARGS=3D -DLUA_BUILD_TYPE=3DSystem \=20 > -DLUA_COMPAT53_DIR=3Ddeps/lua-compat-5.3=20 > diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile=20 > index ab04cd1b5627..1888e9cfa09f 100644=20 > --- a/editors/neovim/Makefile=20 > +++ b/editors/neovim/Makefile=20 > @@ -3,6 +3,7 @@=20 > PORTNAME=3D neovim=20 > DISTVERSIONPREFIX=3D v=20 > DISTVERSION=3D 0.6.0=20 > +PORTREVISION=3D 1=20 > CATEGORIES=3D editors=20 >=20 > MAINTAINER=3D adamw@FreeBSD.org=20 > @@ -13,8 +14,7 @@ LICENSE=3D APACHE20=20 > BUILD_DEPENDS=3D gperf:devel/gperf \=20 > ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \=20 > ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}=20 > -LIB_DEPENDS=3D libluajit-5.1.so:lang/luajit-openresty \=20 > - libluv.so:devel/luv \=20 > +LIB_DEPENDS=3D libluv.so:devel/luv \=20 > libmsgpackc.so:devel/msgpack \=20 > libtermkey.so:devel/libtermkey \=20 > libtree-sitter.so:devel/tree-sitter \=20 > @@ -26,7 +26,7 @@ TEST_DEPENDS=3D autoconf>=3D0:devel/autoconf \=20 > gmake:devel/gmake \=20 > libtool:devel/libtool=20 >=20 > -USES=3D cmake cpe iconv lua:build pathfix pkgconfig=20 > +USES=3D cmake cpe iconv pathfix pkgconfig=20 > USE_GITHUB=3D yes=20 > GH_TUPLE=3D libmpack:libmpack:1.0.5:libmpack \=20 > libmpack:libmpack-lua:1.0.7:libmpack_lua=20 > @@ -39,11 +39,21 @@ CMAKE_ARGS=3D -DLUA_PRG:FILEPATH=3D"${LUA_CMD}" \=20 > DATADIR=3D ${PREFIX}/share/nvim=20 > PORTDATA=3D runtime=20 >=20 > -OPTIONS_DEFINE=3D NLS PYNVIM=20 > +OPTIONS_DEFINE=3D LUAJIT NLS PYNVIM=20 > +OPTIONS_DEFAULT=3DLUAJIT=20 > +OPTIONS_EXCLUDE_aarch64=3D LUAJIT=20 > +OPTIONS_EXCLUDE_mips64=3D LUAJIT=20 > +OPTIONS_EXCLUDE_riscv64=3D LUAJIT=20 > +OPTIONS_EXCLUDE_sparc64=3D LUAJIT=20 > OPTIONS_SUB=3D yes=20 >=20 > +LUAJIT_DESC=3D Use LuaJIT for faster Lua code (recommended)=20 > PYNVIM_DESC=3D Enable support for plugins written in python=20 >=20 > +LUAJIT_CMAKE_OFF=3D -DPREFER_LUA:BOOL=3D"ON"=20 > +LUAJIT_LIB_DEPENDS=3D libluajit-5.1.so:lang/luajit=20 > +LUAJIT_USES=3D lua:build=20 > +LUAJIT_USES_OFF=3D lua:52=20 > NLS_CMAKE_BOOL=3D ENABLE_LIBINTL=20 > NLS_USES=3D gettext=20 > PYNVIM_RUN_DEPENDS=3D ${PYTHON_PKGNAMEPREFIX}pynvim>=3D0.3.0:editors/py-py= nvim@${PY_FLAVOR}=20 > @@ -52,6 +62,7 @@ PYNVIM_USES=3D python:run=20 > .include <bsd.port.options.mk>=20 >=20 > .if ${ARCH:Mpowerpc64*}=20 > +LUAJIT_LIB_DEPENDS=3D libluajit-5.1.so:lang/luajit-openresty=20 > USES+=3D compiler:gcc-c++11-lib=20 > .endif=20 >=20 --Apple-Mail-1BCC018D-4C29-4B4D-A6AF-0EDDE1BECDED Content-Type: multipart/related; type="text/html"; boundary=Apple-Mail-032CF5AF-0250-4311-8859-CDF7AAB9169F Content-Transfer-Encoding: 7bit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B355183F-24CA-4154-B9FB-4102222F578F>