Date: Mon, 08 Dec 2025 20:04:46 +0000 From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 668bddb9d033 - main - devel/lua-language-server: Fix build with DEFAULT_VERSIONS+= ninja=samurai Message-ID: <69372f5e.2aad8.3c3851c8@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=668bddb9d03337fad26037a82581de2f31bdf18b commit 668bddb9d03337fad26037a82581de2f31bdf18b Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2025-12-08 20:01:26 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> CommitDate: 2025-12-08 20:04:42 +0000 devel/lua-language-server: Fix build with DEFAULT_VERSIONS+= ninja=samurai This modifies a hardcoded call to `ninja`. PR: 291489 --- devel/lua-language-server/Makefile | 2 ++ .../files/patch-3rd_luamake_compile_build.sh | 8 ++++++++ .../files/patch-3rd_luamake_scripts_globals.lua | 11 +++++++++++ 3 files changed, 21 insertions(+) diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile index 7018e67ed4c2..68287fa948d6 100644 --- a/devel/lua-language-server/Makefile +++ b/devel/lua-language-server/Makefile @@ -60,6 +60,8 @@ post-patch: ${REINPLACE_CMD} -e 's|%LINK_INOTIFY%|${_LINK_INOTIFY_}|' ${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja ${REINPLACE_CMD} -e 's|%WRKDIR%|${WRKDIR}|' ${WRKSRC}/3rd/luamake/bee.lua/test/test.lua ${REINPLACE_CMD} -e 's|%WRKDIR%|${WRKDIR}|' ${WRKSRC}/3rd/bee.lua/test/test.lua + ${REINPLACE_CMD} -e 's|%NINJA_CMD%|${NINJA_CMD}|' ${WRKSRC}/3rd/luamake/compile/build.sh + ${REINPLACE_CMD} -e 's|%NINJA_CMD%|${NINJA_CMD}|' ${WRKSRC}/3rd/luamake/scripts/globals.lua # `luamake all` instead of `luamake rebuild` because there is a flaky test do-build: diff --git a/devel/lua-language-server/files/patch-3rd_luamake_compile_build.sh b/devel/lua-language-server/files/patch-3rd_luamake_compile_build.sh new file mode 100644 index 000000000000..7c017813c74c --- /dev/null +++ b/devel/lua-language-server/files/patch-3rd_luamake_compile_build.sh @@ -0,0 +1,8 @@ +--- 3rd/luamake/compile/build.sh.orig 2025-10-29 08:38:58 UTC ++++ 3rd/luamake/compile/build.sh +@@ -33,4 +33,4 @@ DIR=$(cd `dirname $0`/..; pwd) + esac + + DIR=$(cd `dirname $0`/..; pwd) +-exec ninja -f "$DIR/compile/ninja/$OS.ninja" $* ++exec %NINJA_CMD% -f "$DIR/compile/ninja/$OS.ninja" $* diff --git a/devel/lua-language-server/files/patch-3rd_luamake_scripts_globals.lua b/devel/lua-language-server/files/patch-3rd_luamake_scripts_globals.lua new file mode 100644 index 000000000000..09f3491edfbe --- /dev/null +++ b/devel/lua-language-server/files/patch-3rd_luamake_scripts_globals.lua @@ -0,0 +1,11 @@ +--- 3rd/luamake/scripts/globals.lua.orig 2025-12-08 19:07:07 UTC ++++ 3rd/luamake/scripts/globals.lua +@@ -8,6 +8,8 @@ globals.mode = globals.mode or "release" + + globals.mode = globals.mode or "release" + ++globals.ninja = globals.ninja or "%NINJA_CMD%" ++ + globals.hostos = globals.hostos or require "bee.platform".os + globals.hostshell = globals.hostshell or (function () + if globals.hostos == "windows" then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69372f5e.2aad8.3c3851c8>