From nobody Thu Dec 2 16:46:11 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 00A9418BED96; Thu, 2 Dec 2021 16:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J4hfq58d8z4drR; Thu, 2 Dec 2021 16:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9219620A77; Thu, 2 Dec 2021 16:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B2GkBfE009058; Thu, 2 Dec 2021 16:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2GkBQY009057; Thu, 2 Dec 2021 16:46:11 GMT (envelope-from git) Date: Thu, 2 Dec 2021 16:46:11 GMT Message-Id: <202112021646.1B2GkBQY009057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a2f29f52f700 - main - editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2f29f52f70007ef491672e59a2d110ae2fc5218 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638463571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ptfU6RPMullzHcD6V5yTzd5PRLLelSBE6XfoXg4jB7U=; b=so9u76zKwZ/ZOza1CZeannsDtljqVkk8Bz3dqOanipyK3sQlKyA9u/ma4gVrlxDiQnajjl MZRCv/f0jPfln47gzJNtHcVcqwtqFXpdzIInsW+vuS9WkPGUd5DI0KQQrrr/mYlNTEylz5 DWP0QozFor3sdC24iXepaUhgLlhLQBkvmSI2T65vtzw0tTmWjkcGTgza+dQtlcjDv//uzM cablv2p7CbOUAY327eJHLFZM8RFTP09bwLMpJLY1AV+Mou3moKM+N5swz10QwWCdP2ltgc Tk5ZGtU9bJQRiIpUZ86PmEyOHIeFx8yMJd6P8qHHl6ueocdfTd/EFICG5hrdzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638463571; a=rsa-sha256; cv=none; b=M75LVSGDiBNgtmoB11NZIGh21BDAkdXotof/AAtFwd8FpScATfJw4TD7uOOuL4WnF1aG/A hr0B8elAuK+CVA9MhHuOynRTEbi5eqEu7CFuF1xFvhu4L4WfG8PplPE5mWwGUCBLp0Lyq9 GjT+mEcb9SRMoELFKQhDZXCxpx6zgsIAkzl5qjbmZi9qJF4v58c4tPxbdq36YO17Ysf9S2 YSlNYHrfVPg2tMuFQjiKFX3NmTivTCbSbmMW4ghCpN25jfCCJJoQO1j/jZHOMPk9v6xq3Z eJ7UMDx7vLtU8ZTrQvaliJlObMVEkbMAGdbtDUDaVUBgmkpW2SxLSPQtGhbVAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2f29f52f70007ef491672e59a2d110ae2fc5218 commit a2f29f52f70007ef491672e59a2d110ae2fc5218 Author: Adam Weinberger AuthorDate: 2021-12-02 16:41:57 +0000 Commit: Adam Weinberger CommitDate: 2021-12-02 16:41:57 +0000 editors/neovim: Partially revert 9b869a4c17db42729cdfaca02c5c9c5ab2d22976 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 | 26 +++++++++++++++++++++----- editors/neovim/Makefile | 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 @@ -1,6 +1,6 @@ PORTNAME= luv DISTVERSION= 1.41.0-0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= checo1705@secmail.pro @@ -9,8 +9,7 @@ COMMENT= libuv bindings for lua LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libuv.so:devel/libuv \ - libluajit-5.1.so:lang/luajit-openresty \ +LIB_DEPENDS= libuv.so:devel/libuv USES= cmake USE_LDCONFIG= yes @@ -20,9 +19,26 @@ GH_PROJECT= luv lua-compat-5.3:compat GH_TAGNAME= bc91f40:compat GH_SUBDIR= deps/lua-compat-5.3:compat -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES LUAJIT +OPTIONS_DEFAULT_aarch64= LUAJIT +OPTIONS_DEFAULT_amd64= LUAJIT +OPTIONS_DEFAULT_i386= LUAJIT +OPTIONS_DEFAULT_powerpc= LUAJIT +OPTIONS_DEFAULT_powerpc64= LUAJIT +OPTIONS_DEFAULT_powerpc64le= LUAJIT -CMAKE_ON= BUILD_SHARED_LIBS WITH_LUA_ENGINE=LuaJIT WITH_SHARED_LIBUV +LUAJIT_DESC= Use LuaJIT (instead of just Lua; recommended) +LUAJIT_LIB_DEPENDS= ${LUAJIT_LIB_DEPENDS_${ARCH}} +LUAJIT_LIB_DEPENDS_aarch64= libluajit-5.1.so:lang/luajit-openresty +LUAJIT_LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit +LUAJIT_LIB_DEPENDS_i386= libluajit-5.1.so:lang/luajit +LUAJIT_LIB_DEPENDS_powerpc= libluajit-5.1.so:lang/luajit +LUAJIT_LIB_DEPENDS_powerpc64= libluajit-5.1.so:lang/luajit-openresty +LUAJIT_LIB_DEPENDS_powerpc64le= libluajit-5.1.so:lang/luajit-openresty +LUAJIT_CMAKE_ON= -DWITH_LUA_ENGINE=LuaJIT +LUAJIT_CMAKE_OFF= -DWITH_LUA_ENGINE=Lua +LUAJIT_USES_OFF= lua +CMAKE_ON= BUILD_SHARED_LIBS WITH_SHARED_LIBUV CMAKE_OFF= BUILD_MODULE CMAKE_ARGS= -DLUA_BUILD_TYPE=System \ -DLUA_COMPAT53_DIR=deps/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 @@ -3,6 +3,7 @@ PORTNAME= neovim DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= adamw@FreeBSD.org @@ -13,8 +14,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= gperf:devel/gperf \ ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} -LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty \ - libluv.so:devel/luv \ +LIB_DEPENDS= libluv.so:devel/luv \ libmsgpackc.so:devel/msgpack \ libtermkey.so:devel/libtermkey \ libtree-sitter.so:devel/tree-sitter \ @@ -26,7 +26,7 @@ TEST_DEPENDS= autoconf>=0:devel/autoconf \ gmake:devel/gmake \ libtool:devel/libtool -USES= cmake cpe iconv lua:build pathfix pkgconfig +USES= cmake cpe iconv pathfix pkgconfig USE_GITHUB= yes GH_TUPLE= libmpack:libmpack:1.0.5:libmpack \ libmpack:libmpack-lua:1.0.7:libmpack_lua @@ -39,11 +39,21 @@ CMAKE_ARGS= -DLUA_PRG:FILEPATH="${LUA_CMD}" \ DATADIR= ${PREFIX}/share/nvim PORTDATA= runtime -OPTIONS_DEFINE= NLS PYNVIM +OPTIONS_DEFINE= LUAJIT NLS PYNVIM +OPTIONS_DEFAULT=LUAJIT +OPTIONS_EXCLUDE_aarch64= LUAJIT +OPTIONS_EXCLUDE_mips64= LUAJIT +OPTIONS_EXCLUDE_riscv64= LUAJIT +OPTIONS_EXCLUDE_sparc64= LUAJIT OPTIONS_SUB= yes +LUAJIT_DESC= Use LuaJIT for faster Lua code (recommended) PYNVIM_DESC= Enable support for plugins written in python +LUAJIT_CMAKE_OFF= -DPREFER_LUA:BOOL="ON" +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_USES= lua:build +LUAJIT_USES_OFF= lua:52 NLS_CMAKE_BOOL= ENABLE_LIBINTL NLS_USES= gettext PYNVIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynvim>=0.3.0:editors/py-pynvim@${PY_FLAVOR} @@ -52,6 +62,7 @@ PYNVIM_USES= python:run .include .if ${ARCH:Mpowerpc64*} +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty USES+= compiler:gcc-c++11-lib .endif