Date: Fri, 3 Dec 2021 00:12:38 +0300 From: Dima Panov <fluffy@FreeBSD.org> To: Adam Weinberger <adamw@adamw.org> Cc: Adam Weinberger <adamw@freebsd.org>, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, ports-committers@freebsd.org Subject: Re: git: a2f29f52f700 - main - editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 Message-ID: <2451df65-6bc7-4a53-96d2-905f4a5ec2cb@Canary> In-Reply-To: <B355183F-24CA-4154-B9FB-4102222F578F@adamw.org> References: <0aae2691-9f22-44da-8609-87a9f8b0620c@Canary> <B355183F-24CA-4154-B9FB-4102222F578F@adamw.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--61a936c6_12200854_397 Content-Type: multipart/alternative; boundary="61a936c6_5bd062c2_397" --61a936c6_5bd062c2_397 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Done as https://cgit.=46reeBSD.org/ports/commit/=3Fid=3D136c812980e4846c7= df5c402f7b8d51b7cc8da39 Thanks=21 -- Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > On Thursday, Dec 02, 2021 at 11:57 PM, Adam Weinberger <adamw=40adamw.o= rg (mailto:adamw=40adamw.org)> wrote: > I=E2=80=99m a few hours from home. Please, commit it if you=E2=80=99d l= ike=21 > > =23 Adam > > > =E2=80=94 > Adam Weinberger > adamw=40adamw.org > https://www.adamw.org > > > > On Dec 2, 2021, at 11:30, Dima Panov <fluffy=40freebsd.org> wrote: > > > > =EF=BB=BF > > Moin=21 > > > > > > Please fore lua52 for the build with luajit. > > > > Neovim is unable to build with lua53+ as default > > > > > > diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile > > index 1888e9cfa09f..0a0429fe5453 100644 > > --- a/editors/neovim/Makefile > > +++ b/editors/neovim/Makefile > > =40=40 -52,7 +52,7 =40=40 PYNVIM=5FDESC=3D Enable support for plugins= written in python > > > > LUAJIT=5FCMAKE=5FO=46=46=3D -DPRE=46ER=5FLUA:BOOL=3D=22ON=22 > > LUAJIT=5FLIB=5FDEPENDS=3D libluajit-5.1.so:lang/luajit > > -LUAJIT=5FUSES=3D lua:build > > +LUAJIT=5FUSES=3D lua:52,build > > LUAJIT=5FUSES=5FO=46=46=3D lua:52 > > NLS=5FCMAKE=5FBOOL=3D ENABLE=5FLIBINTL > > NLS=5FUSES=3D gettext > > > > > > > > -- > > Dima. (desktop, kde, x11, office, ports-secteam)=40=46reeBSD team > > (fluffy=40=46reeBSD.org, https://t.me/dima=5Fpanov) > > > > > > > On Thursday, Dec 02, 2021 at 7:46 PM, Adam Weinberger <adamw=40=46r= eeBSD.org (mailto:adamw=40=46reeBSD.org)> wrote: > > > The branch main has been updated by adamw: > > > > > > URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3Da2f29f52f70007= ef491672e59a2d110ae2fc5218 > > > > > > commit a2f29f52f70007ef491672e59a2d110ae2fc5218 > > > Author: Adam Weinberger <adamw=40=46reeBSD.org> > > > AuthorDate: 2021-12-02 16:41:57 +0000 > > > Commit: Adam Weinberger <adamw=40=46reeBSD.org> > > > CommitDate: 2021-12-02 16:41:57 +0000 > > > > > > editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2= d22976 > > > > > > luajit-openresty causes lua errors with many nvim plugins. I don't = know > > > why, and until I have time to diagnose it, revert the switch to > > > hardcoded luajit-openresty. In the short term I'll likely switch to= > > > hardcoding luajit and removing the PUC Lua option. > > > --- > > > devel/luv/Makefile =7C 26 +++++++++++++++++++++----- > > > editors/neovim/Makefile =7C 19 +++++++++++++++---- > > > 2 files changed, 36 insertions(+), 9 deletions(-) > > > > > > diff --git a/devel/luv/Makefile b/devel/luv/Makefile > > > index d4823eb8b3a1..cba39bbd4659 100644 > > > --- a/devel/luv/Makefile > > > +++ b/devel/luv/Makefile > > > =40=40 -1,6 +1,6 =40=40 > > > PORTNAME=3D luv > > > DISTVERSION=3D 1.41.0-0 > > > -PORTREVISION=3D 1 > > > +PORTREVISION=3D 2 > > > CATEGORIES=3D devel > > > > > > MAINTAINER=3D checo1705=40secmail.pro > > > =40=40 -9,8 +9,7 =40=40 COMMENT=3D libuv bindings for lua > > > LICENSE=3D APACHE20 > > > LICENSE=5F=46ILE=3D =24=7BWRKSRC=7D/LICENSE.txt > > > > > > -LIB=5FDEPENDS=3D libuv.so:devel/libuv =5C > > > - libluajit-5.1.so:lang/luajit-openresty =5C > > > +LIB=5FDEPENDS=3D libuv.so:devel/libuv > > > > > > USES=3D cmake > > > USE=5FLDCON=46IG=3D yes > > > =40=40 -20,9 +19,26 =40=40 GH=5FPROJECT=3D luv lua-compat-5.3:compa= t > > > GH=5FTAGNAME=3D bc91f40:compat > > > GH=5FSUBDIR=3D deps/lua-compat-5.3:compat > > > > > > -OPTIONS=5FDE=46INE=3D DOCS EXAMPLES > > > +OPTIONS=5FDE=46INE=3D DOCS EXAMPLES LUAJIT > > > +OPTIONS=5FDE=46AULT=5Faarch64=3D LUAJIT > > > +OPTIONS=5FDE=46AULT=5Famd64=3D LUAJIT > > > +OPTIONS=5FDE=46AULT=5Fi386=3D LUAJIT > > > +OPTIONS=5FDE=46AULT=5Fpowerpc=3D LUAJIT > > > +OPTIONS=5FDE=46AULT=5Fpowerpc64=3D LUAJIT > > > +OPTIONS=5FDE=46AULT=5Fpowerpc64le=3D LUAJIT > > > > > > -CMAKE=5FON=3D BUILD=5FSHARED=5FLIBS WITH=5FLUA=5FENGINE=3DLuaJIT W= ITH=5FSHARED=5FLIBUV > > > +LUAJIT=5FDESC=3D Use LuaJIT (instead of just Lua; recommended) > > > +LUAJIT=5FLIB=5FDEPENDS=3D =24=7BLUAJIT=5FLIB=5FDEPENDS=5F=24=7BARC= H=7D=7D > > > +LUAJIT=5FLIB=5FDEPENDS=5Faarch64=3D libluajit-5.1.so:lang/luajit-o= penresty > > > +LUAJIT=5FLIB=5FDEPENDS=5Famd64=3D libluajit-5.1.so:lang/luajit > > > +LUAJIT=5FLIB=5FDEPENDS=5Fi386=3D libluajit-5.1.so:lang/luajit > > > +LUAJIT=5FLIB=5FDEPENDS=5Fpowerpc=3D libluajit-5.1.so:lang/luajit > > > +LUAJIT=5FLIB=5FDEPENDS=5Fpowerpc64=3D libluajit-5.1.so:lang/luajit= -openresty > > > +LUAJIT=5FLIB=5FDEPENDS=5Fpowerpc64le=3D libluajit-5.1.so:lang/luaj= it-openresty > > > +LUAJIT=5FCMAKE=5FON=3D -DWITH=5FLUA=5FENGINE=3DLuaJIT > > > +LUAJIT=5FCMAKE=5FO=46=46=3D -DWITH=5FLUA=5FENGINE=3DLua > > > +LUAJIT=5FUSES=5FO=46=46=3D lua > > > +CMAKE=5FON=3D BUILD=5FSHARED=5FLIBS WITH=5FSHARED=5FLIBUV > > > CMAKE=5FO=46=46=3D BUILD=5FMODULE > > > CMAKE=5FARGS=3D -DLUA=5FBUILD=5FTYPE=3DSystem =5C > > > -DLUA=5FCOMPAT53=5FDIR=3Ddeps/lua-compat-5.3 > > > diff --git a/editors/neovim/Makefile b/editors/neovim/Makefile > > > index ab04cd1b5627..1888e9cfa09f 100644 > > > --- a/editors/neovim/Makefile > > > +++ b/editors/neovim/Makefile > > > =40=40 -3,6 +3,7 =40=40 > > > PORTNAME=3D neovim > > > DISTVERSIONPRE=46IX=3D v > > > DISTVERSION=3D 0.6.0 > > > +PORTREVISION=3D 1 > > > CATEGORIES=3D editors > > > > > > MAINTAINER=3D adamw=40=46reeBSD.org > > > =40=40 -13,8 +14,7 =40=40 LICENSE=3D APACHE20 > > > BUILD=5FDEPENDS=3D gperf:devel/gperf =5C > > > =24=7BLUA=5FMODLIBDIR=7D/bit.so:devel/lua-bitop=40=24=7BLUA=5F=46LA= VOR=7D =5C > > > =24=7BLUA=5FMODLIBDIR=7D/lpeg.so:devel/lua-lpeg=40=24=7BLUA=5F=46LA= VOR=7D > > > -LIB=5FDEPENDS=3D libluajit-5.1.so:lang/luajit-openresty =5C > > > - libluv.so:devel/luv =5C > > > +LIB=5FDEPENDS=3D libluv.so:devel/luv =5C > > > libmsgpackc.so:devel/msgpack =5C > > > libtermkey.so:devel/libtermkey =5C > > > libtree-sitter.so:devel/tree-sitter =5C > > > =40=40 -26,7 +26,7 =40=40 TEST=5FDEPENDS=3D autoconf>=3D0:devel/aut= oconf =5C > > > gmake:devel/gmake =5C > > > libtool:devel/libtool > > > > > > -USES=3D cmake cpe iconv lua:build pathfix pkgconfig > > > +USES=3D cmake cpe iconv pathfix pkgconfig > > > USE=5FGITHUB=3D yes > > > GH=5FTUPLE=3D libmpack:libmpack:1.0.5:libmpack =5C > > > libmpack:libmpack-lua:1.0.7:libmpack=5Flua > > > =40=40 -39,11 +39,21 =40=40 CMAKE=5FARGS=3D -DLUA=5FPRG:=46ILEPATH=3D= =22=24=7BLUA=5FCMD=7D=22 =5C > > > DATADIR=3D =24=7BPRE=46IX=7D/share/nvim > > > PORTDATA=3D runtime > > > > > > -OPTIONS=5FDE=46INE=3D NLS PYNVIM > > > +OPTIONS=5FDE=46INE=3D LUAJIT NLS PYNVIM > > > +OPTIONS=5FDE=46AULT=3DLUAJIT > > > +OPTIONS=5FEXCLUDE=5Faarch64=3D LUAJIT > > > +OPTIONS=5FEXCLUDE=5Fmips64=3D LUAJIT > > > +OPTIONS=5FEXCLUDE=5Friscv64=3D LUAJIT > > > +OPTIONS=5FEXCLUDE=5Fsparc64=3D LUAJIT > > > OPTIONS=5FSUB=3D yes > > > > > > +LUAJIT=5FDESC=3D Use LuaJIT for faster Lua code (recommended) > > > PYNVIM=5FDESC=3D Enable support for plugins written in python > > > > > > +LUAJIT=5FCMAKE=5FO=46=46=3D -DPRE=46ER=5FLUA:BOOL=3D=22ON=22 > > > +LUAJIT=5FLIB=5FDEPENDS=3D libluajit-5.1.so:lang/luajit > > > +LUAJIT=5FUSES=3D lua:build > > > +LUAJIT=5FUSES=5FO=46=46=3D lua:52 > > > NLS=5FCMAKE=5FBOOL=3D ENABLE=5FLIBINTL > > > NLS=5FUSES=3D gettext > > > PYNVIM=5FRUN=5FDEPENDS=3D =24=7BPYTHON=5FPKGNAMEPRE=46IX=7Dpynvim>=3D= 0.3.0:editors/py-pynvim=40=24=7BPY=5F=46LAVOR=7D > > > =40=40 -52,6 +62,7 =40=40 PYNVIM=5FUSES=3D python:run > > > .include <bsd.port.options.mk> > > > > > > .if =24=7BARCH:Mpowerpc64*=7D > > > +LUAJIT=5FLIB=5FDEPENDS=3D libluajit-5.1.so:lang/luajit-openresty > > > USES+=3D compiler:gcc-c++11-lib > > > .endif > > > --61a936c6_5bd062c2_397-- --61a936c6_12200854_397 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJhqTbGAAoJEPuLoJ3VOY8p9j0P/1/y3NHQ2EnM 7UVA0sbCTz4xhnSJ85RTMKQmdzcZQ88CxAKvBgPEB74P5yKQ5SumvIyWx5koKP8x eya4bIpbl3ENlPSz+quj874xwZdO5bGSWlUbH2Vu05rPz7dIxSzDYKDVjrcgHtjI 4EDkWASf+Y1Nx8/5RTZbye8DpOaItC4+DF+bzmkiqwCQtfNwBXLU9hntLMm4GReg vyTjC4dxvIzz1NsDKIt6uxy6zAZ7NSXapNrjv8tFM6ULl97IPZ2BcXf/WfTXYEk0 SofDzdIn22iyyZTAxM36reh9+ZVgsfrBOZtypzwzJ5JWIQrB862Dkzh7Nilo8szC J3V2sfaFXfp0GgEJUQxw86rcfdDl7/nNFaEa7WrDcjjPurzvSi/qWGzlh/WUmgIN x/D0JTF4XmddarpAJCI4onMl/QJW5RE7zHD8YM3dWwqGfqi4lVhEr0p+RuPnQ217 3wGFcIbO6awjEUg7kxcVXOxhbhKLAxMqtaAjgFq8x0huod0zrXcaWQWrYWCKEF0Y SM1ywU8m7NQO8PVgNQ1exhI5dW/MUJwSlYXMePZoDkXxBS3yDXyoYjsCjUQ9Jian lYZk/ymVdUgYNPvv6EFCVGxoDDnDXaeZ9pZY2ecE6/SRw2aw6nkRJ2exDKIqjCWB fLpxqNEYnAedNmUW8owML8+gBVCmUw67 =YBTj -----END PGP SIGNATURE----- --61a936c6_12200854_397--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2451df65-6bc7-4a53-96d2-905f4a5ec2cb>