<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15c0b7b0a4e67790bcab8647a482d1f81665f1df">https://github.com/macports/macports-ports/commit/15c0b7b0a4e67790bcab8647a482d1f81665f1df</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 15c0b7b0a4e67790bcab8647a482d1f81665f1df
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sat Oct 28 00:46:29 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> luarocks-1.0: fix implementation arg and version isolation
</span>---
_resources/port1.0/group/luarocks-1.0.tcl | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/luarocks-1.0.tcl b/_resources/port1.0/group/luarocks-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index eb238b6f03d..f330306adbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/luarocks-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/luarocks-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,7 @@ default luarocks.link_binaries yes
</span> default luarocks.link_binaries_suffix {-${luarocks.branch}}
# luarocks group setup procedure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {implementation "luarocks"}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {implementation "lua"}} {
</span> global name subport luarocks.branches luarocks.default_branch luarocks.dependencies
global destroot prefix distpath distname worksrcpath os.platform
global configure.cc configure.cflags configure.ldflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,8 +146,10 @@ proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {
</span> }
} else {
switch ${implementation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lua52 { luarocks.branch 5.2 }
</span> lua { luarocks.branch 5.3 }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua52 { luarocks.branch 5.2 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua53 { luarocks.branch 5.3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua54 { luarocks.branch 5.4 }
</span> default {
ui_error "luarocks.setup: unknown implementation '${implementation}' specified"
return -code error "luarocks.setup failed"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,7 +203,7 @@ proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {
</span> build {}
destroot.cmd ${luarocks.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args --tree ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args --lua-version ${luarocks.branch} --tree ${destroot}${prefix}
</span> destroot.args make --deps-mode none
destroot.post_args ${distpath}/${luarocks.distname}.rockspec
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +233,7 @@ proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {
</span> build {}
destroot.cmd ${luarocks.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args --tree ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args --lua-version ${luarocks.branch} --tree ${destroot}${prefix}
</span> destroot.args build --deps-mode none
destroot.post_args ${worksrcpath}/${luarocks.distname}.src.rock
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,7 +265,7 @@ proc luarocks.setup {module vers {type "src.rock"} {docs {}} {source "custom"} {
</span> build {}
destroot.cmd ${luarocks.bin}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args --tree ${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args --lua-version ${luarocks.branch} --tree ${destroot}${prefix}
</span> destroot.args build --deps-mode none
destroot.post_args ${worksrcpath}/${luarocks.distname}.all.rock
</pre><pre style='margin:0'>
</pre>