Received: by mail.netbsd.org (Postfix, from userid 605) id E91EF84E81; Fri, 12 May 2023 21:37:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 242A284DA5 for ; Fri, 12 May 2023 21:37:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id yYM95UNI0107 for ; Fri, 12 May 2023 21:37:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 94EBA84D36 for ; Fri, 12 May 2023 21:37:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8E7C7FA87; Fri, 12 May 2023 21:37:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1683927452138330" MIME-Version: 1.0 Date: Fri, 12 May 2023 21:37:32 +0000 From: "Nikita" Subject: CVS commit: pkgsrc/devel/lua-language-server To: pkgsrc-changes@NetBSD.org Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20230512213732.8E7C7FA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1683927452138330 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nikita Date: Fri May 12 21:37:32 UTC 2023 Modified Files: pkgsrc/devel/lua-language-server: Makefile Log Message: lua-language-server: patch out randomly failing filewatch test, add clang build dependency. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/lua-language-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1683927452138330 Content-Disposition: inline Content-Length: 1840 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/lua-language-server/Makefile diff -u pkgsrc/devel/lua-language-server/Makefile:1.5 pkgsrc/devel/lua-language-server/Makefile:1.6 --- pkgsrc/devel/lua-language-server/Makefile:1.5 Fri Apr 28 16:10:41 2023 +++ pkgsrc/devel/lua-language-server/Makefile Fri May 12 21:37:32 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/04/28 16:10:41 nikita Exp $ +# $NetBSD: Makefile,v 1.6 2023/05/12 21:37:32 nikita Exp $ DISTNAME= lua-language-server-3.6.19 PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}/} @@ -19,6 +19,8 @@ MAKE_FLAGS+= LUA_VERSION=${LUA_VERSION_ USE_TOOLS+= pax mktemp TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build +# 3rd/luamake, maybe needs path patching: +DEPENDS+= clang-[0-9]*:../../lang/clang BUILDLINK_TRANSFORM+= rm:-Werror @@ -40,7 +42,7 @@ post-extract: DATADIR= ${PREFIX}/share/lua-language-server -SUBST_CLASSES+= wrapper +SUBST_CLASSES+= wrapper SUBST_STAGE.wrapper= pre-build SUBST_MESSAGE.wrapper= Patching paths in lua-language-server wrapper script SUBST_FILES.wrapper= lua-language-server @@ -54,8 +56,16 @@ SUBST_FILES.path= 3rd/luamake/compile/ni SUBST_FILES.path+= 3rd/bee.lua/compile/common.lua SUBST_SED.path= -e 's,/usr/pkg,${PREFIX},' +SUBST_CLASSES+= tests +SUBST_STAGE.tests= pre-configure +SUBST_MESSAGE.tests= Do not run randomly failing filewatch tests. +SUBST_FILES.tests+= 3rd/bee.lua/test/test.lua +SUBST_FILES.tests+= 3rd/luamake/bee.lua/test/test.lua +SUBST_SED.tests= -e "s,require 'test_filewatch',," + do-build: - ninja -C ${WRKSRC}/3rd/luamake -f compile/ninja/netbsd.ninja + # probably needs much more fixes for systems noch supported by luamake. + ${PREFIX}/bin/ninja -C ${WRKSRC}/3rd/luamake -f compile/ninja/${OPSYS:tl}.ninja cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./3rd/luamake/luamake -v do-install: --_----------=_1683927452138330--