From nobody Thu Dec 2 18:30:18 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2199618C8A1A; Thu, 2 Dec 2021 18:30:25 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4kz467Zdz3kxp; Thu, 2 Dec 2021 18:30:24 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from [192.168.1.65] (37-145-188-182.broadband.corbina.ru [37.145.188.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: fluffy) by smtp.freebsd.org (Postfix) with ESMTPSA id 23C062F7CE; Thu, 2 Dec 2021 18:30:22 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Date: Thu, 2 Dec 2021 21:30:18 +0300 From: Dima Panov <fluffy@FreeBSD.org> To: dev-commits-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-main@FreeBSD.org, Adam Weinberger <adamw@FreeBSD.org> Message-ID: <0aae2691-9f22-44da-8609-87a9f8b0620c@Canary> In-Reply-To: <202112021646.1B2GkBQY009057@gitrepo.freebsd.org> References: <202112021646.1B2GkBQY009057@gitrepo.freebsd.org> Subject: Re: git: a2f29f52f700 - main - editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: <mailto:dev-commits-ports-all+help@freebsd.org> List-Post: <mailto:dev-commits-ports-all@freebsd.org> List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org> List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org> Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="61a910bb_515f007c_397"; protocol="application/pgp-signature" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638469824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=zYZ3YaILvViG90AtEqzLuhqucqGUj6+mCqNWlwPh/u0=; b=gmVUH2vYSd7c91hhXjul4jpXbH+jP6DU1DKqYBLrl62G4FeC0ZGnH3w5oLGMiwVdUzZA/K fkjSUC7C0CrynUVeQJcUaUiocR0LI/W5r7+PHpagcw10e4WIHdIybwi57aHxBYen5SddCS wNmeO7+nra1+X9+zGqVbiSG/k3XAHr+TyPsK0jpuYGt2vr+UT2j2lbqmgCPy1ufiAY/lNO 7RRGKj/xMD0InyeL/ME5sGDvujsS7E2AGDV6TNXsEzTJxpQZv2bBYeH+ySwVTOVHe/Q/VH AJIpf5M5dpgoCUgtBIlqd8IZz66RtuOfRX4pdk0IuSu1X+gT4H7PrvSq9eSBdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638469824; a=rsa-sha256; cv=none; b=O3yGkjnlIThubfY6Iy/pBt2mSrlAL9jek1+pInhR2KgnVaGt5SiY2cC413vJqesvHi27Wc AKHfpsOU7O12KfpqjofcD2/TTmXoeIXK5+CXhpS/OYxkFtzayVOJ825s0K4owFqPBU3Wus h9GBt6wB4q8pA91fL9bRp/t6z3PlOPvnTmHJTvccK5T2QijT4N671KUvu9burHZzDW7URZ qYg8cakqB9ycAdlTBEN1le7BKb3aNN1jH215EnHGVxh8xnLAgzvVej698GHc4EUrzMKtZv PPBImKsT9BihZenlRUAZgRiX+qB3iNkKMq2mBaU7KOXE1o3Z+ZfEoqI6H0ujyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --61a910bb_515f007c_397 Content-Type: multipart/alternative; boundary="61a910ba_7545e146_397" --61a910ba_7545e146_397 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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 wri= tten 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=46reeBS= D.org (mailto:adamw=40=46reeBSD.org)> wrote: > The branch main has been updated by adamw: > > URL: https://cgit.=46reeBSD.org/ports/commit/=3Fid=3Da2f29f52f70007ef49= 1672e59a2d110ae2fc5218 > > 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 9b869a4c17db42729cdfaca02c5c9c5ab2d229= 76 > > 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:compat > 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 WITH=5F= SHARED=5FLIBUV > +LUAJIT=5FDESC=3D Use LuaJIT (instead of just Lua; recommended) > +LUAJIT=5FLIB=5FDEPENDS=3D =24=7BLUAJIT=5FLIB=5FDEPENDS=5F=24=7BARCH=7D= =7D > +LUAJIT=5FLIB=5FDEPENDS=5Faarch64=3D libluajit-5.1.so:lang/luajit-openr= esty > +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-ope= nresty > +LUAJIT=5FLIB=5FDEPENDS=5Fpowerpc64le=3D libluajit-5.1.so:lang/luajit-o= penresty > +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=46LAVOR=7D= =5C > =24=7BLUA=5FMODLIBDIR=7D/lpeg.so:devel/lua-lpeg=40=24=7BLUA=5F=46LAVOR=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/autocon= f =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>=3D0.= 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 > --61a910ba_7545e146_397-- --61a910bb_515f007c_397 Content-Type: application/pgp-signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: Canary PGP V3 iQJVBAABCgA/OBxEaW1hIFBhbm92IChGcmVlQlNELk9SRyBDb21taXR0ZXIpIDxm bHVmZnlARnJlZUJTRC5PUkc+BQJhqRC6AAoJEPuLoJ3VOY8pJBQP/3smIXuUtGjY XPv3a3tfQjjTilUZY8/sxjQ/66s7nl97DALmmFqVs0qP0+ouMQAJ/2YTGMvADyNn LYjQbVx7ctrhD74wcXJg8nTyrzmNc7KhOeQec5h/hOXaMDLNN8aWe/GsEQ2TC7r1 rFzyRloGb0BkACH2j8Wu7aJmPfVCOv9EAvkdlTibL4TyLQLcXD3XwGSwt1eoJPQT +PsOM9JX+yIccuLCyPJPV5ug5pgTMmuZM/qYuBULDHBgVHDnB+mDC9N9/ASh4V+y Q2fxV3wC45MTkd55k0H6XEvCxKg1GjVvm74MO9MCEVAIBqn4NGZ51/OvGIUS9I+Y q5dLSVOj1jMkI/8drTxMPl6kXy2KA07I08hkU4eImsC0SAlFQRHBFXnrCNWqx1Hi Hnb32RptH1bLWSKTw5iNwA5J2Eqf84/5ilCnjKukNpmmz7x8Be0NaskKsrmS3ORH Ox/NMjCHKaTYuciqBqIaOjSVQ/9JIzIKMPRrDNea3yoRpVZVRFDb13aba+2myIez Uzxcjw3JZnPEYeKkRg4AT9qXAU3GbMfpnw89jz1cV4TzLxDqfA6jY5dM/K+zX7eJ kWhRIoZh0G6KNvJl56I/x479jQQzJPR724S2OvIMKXSIHqpCXLdIfSohdQ/hFurt vwI/AHgjEz04whJkB8YQsR6ymRX6FXPg =u3TS -----END PGP SIGNATURE----- --61a910bb_515f007c_397--