Page MenuHomeFreeBSD
Files F153890735

updated.diff
dave_freedave.net (David Marker)
Actions

Authored By
dave_freedave.net
Fri, Apr 24, 1:55 PM
Size
2 KB
Referenced Files
None
Subscribers
None

updated.diff
View Options

diff --git a/devel/lua-language-server/Makefile b/devel/lua-language-server/Makefile
index 7e03e5c5cbce..b9b81f802d7c 100644
--- a/devel/lua-language-server/Makefile
+++ b/devel/lua-language-server/Makefile
@@ -66,6 +66,8 @@ LM_INOTIFY_LINK= links = "inotify",
.endif
post-patch:
+ ${REINPLACE_CMD} -e 's|%CC%|${CCACHE_BIN} ${CC}|' ${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja
+ ${REINPLACE_CMD} -e 's|%CC%|${CCACHE_BIN} ${CC}|' ${WRKSRC}/3rd/luamake/scripts/globals.lua
${REINPLACE_CMD} -e 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/3rd/bee.lua/compile/common.lua
${REINPLACE_CMD} -e 's|%LM_INOTIFY_LINK%|${LM_INOTIFY_LINK}|' ${WRKSRC}/3rd/bee.lua/compile/common.lua
${REINPLACE_CMD} -e 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/3rd/luamake/compile/ninja/freebsd.ninja
@@ -77,8 +79,8 @@ post-patch:
# `luamake all` instead of `luamake rebuild` because there is a flaky test
do-build:
- cd ${WRKSRC}/3rd/luamake && compile/build.sh notest
- cd ${WRKSRC} && 3rd/luamake/luamake all
+ cd ${WRKSRC}/3rd/luamake && compile/build.sh -v notest
+ cd ${WRKSRC} && env && 3rd/luamake/luamake -v all
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}/bin
diff --git a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja b/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
index 65683bf52268..fb6bb9a806e7 100644
--- a/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
+++ b/devel/lua-language-server/files/patch-3rd_luamake_compile_ninja_freebsd.ninja
@@ -1,5 +1,14 @@
---- 3rd/luamake/compile/ninja/freebsd.ninja.orig 2026-01-10 05:26:24 UTC
+--- 3rd/luamake/compile/ninja/freebsd.ninja.orig 2025-12-23 05:34:22 UTC
+++ 3rd/luamake/compile/ninja/freebsd.ninja
+@@ -2,7 +2,7 @@ obj = $builddir/obj
+ builddir = build/freebsd
+ bin = $builddir/bin
+ obj = $builddir/obj
+-cc = clang
++cc = %CC%
+ ar = ar
+ luamake = luamake
+ rule c_source_lua
@@ -30,7 +30,7 @@ rule cxx_source_bee_2
rule cxx_source_bee_2
command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
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
index 09f3491edfbe..41c3cfa1950d 100644
--- a/devel/lua-language-server/files/patch-3rd_luamake_scripts_globals.lua
+++ b/devel/lua-language-server/files/patch-3rd_luamake_scripts_globals.lua
@@ -1,10 +1,11 @@
---- 3rd/luamake/scripts/globals.lua.orig 2025-12-08 19:07:07 UTC
+--- 3rd/luamake/scripts/globals.lua.orig 2026-04-24 13:47:30 UTC
+++ 3rd/luamake/scripts/globals.lua
-@@ -8,6 +8,8 @@ globals.mode = globals.mode or "release"
+@@ -8,6 +8,9 @@ globals.mode = globals.mode or "release"
globals.mode = globals.mode or "release"
+globals.ninja = globals.ninja or "%NINJA_CMD%"
++globals.cc = "%CC%"
+
globals.hostos = globals.hostos or require "bee.platform".os
globals.hostshell = globals.hostshell or (function ()

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32128703
Default Alt Text
updated.diff (2 KB)

Event Timeline