<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/873e12e04ec227c3df0c376da265bde0dcc601c6">https://github.com/macports/macports-ports/commit/873e12e04ec227c3df0c376da265bde0dcc601c6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 873e12e04ec lua-luarocks: read build flags from environment
</span>873e12e04ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 873e12e04ec227c3df0c376da265bde0dcc601c6
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Fri May 28 14:25:38 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> lua-luarocks: read build flags from environment
</span>---
lua/lua-luarocks/Portfile | 7 +++---
.../files/patch-src_luarocks_core_cfg.diff | 29 ++++++++++++++++------
2 files changed, 25 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luarocks/Portfile b/lua/lua-luarocks/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cce666a4af..c112ab1787a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luarocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luarocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span>
github.setup luarocks luarocks 3.7.0 v
name lua-luarocks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license MIT
categories lua devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,12 +81,13 @@ foreach branch ${branches} {
</span>
patchfiles patch-src_luarocks_core_cfg.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|g;s|%CC%|${configure.cc}|g" ${worksrcpath}/src/luarocks/core/cfg.lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/src/luarocks/core/cfg.lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|%CC%|${configure.cc}|g" ${worksrcpath}/src/luarocks/core/cfg.lua
</span> }
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.keepdirs ${destroot}${prefix}/share/luarocks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs ${destroot}${prefix}/share/luarocks
</span> post-destroot {
foreach f [glob -tails -directory ${destroot}${prefix}/bin luarocks*] {
move ${destroot}${prefix}/bin/${f} ${destroot}${prefix}/bin/${f}-${lua.branch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-luarocks/files/patch-src_luarocks_core_cfg.diff b/lua/lua-luarocks/files/patch-src_luarocks_core_cfg.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d5410602c2..ec4ebcc23d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-luarocks/files/patch-src_luarocks_core_cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-luarocks/files/patch-src_luarocks_core_cfg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,41 @@
</span> --- src/luarocks/core/cfg.lua.orig 2021-04-13 21:53:35.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/luarocks/core/cfg.lua 2021-05-26 17:45:27.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,11 +349,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/luarocks/core/cfg.lua 2021-05-28 14:15:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,13 +349,13 @@
</span> defaults.static_lib_extension = "a"
defaults.external_lib_extension = "so"
defaults.obj_extension = "o"
- defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- defaults.variables.CFLAGS = "-O2"
</span> + defaults.external_deps_dirs = { "%PREFIX%" }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- defaults.variables.CFLAGS = "-O2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
</span> defaults.cmake_generator = "Unix Makefiles"
- defaults.variables.CC = "gcc"
- defaults.variables.LD = "gcc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defaults.variables.CC = "%CC%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defaults.variables.LD = "%CC%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.CC = os.getenv("CC") or "%CC%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.LD = defaults.variables.CC
</span> defaults.gcc_rpath = true
<span style='display:block; white-space:pre;background:#ffe0e0;'>- defaults.variables.LIBFLAG = "-shared"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defaults.variables.LIBFLAG = "-shared"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared"
</span> defaults.variables.TEST = "test"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaults.external_deps_patterns = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +435,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaults.variables.MAKE = "make"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaults.external_lib_extension = "dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaults.arch = "macosx-"..target_cpu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -bundle -undefined dynamic_lookup -all_load"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ local version = util.popen_read("sw_vers -productVersion")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not (version:match("^%d+%.%d+%.%d+$") or version:match("^%d+%.%d+$")) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = "10.3"
</span> @@ -448,8 +448,8 @@
else
defaults.gcc_rpath = false
end
- defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
- defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." gcc"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." %CC%"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defaults.variables.LD = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." %CC%"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.CC = "env MACOSX_DEPLOYMENT_TARGET="..tostring(version).." "..defaults.variables.CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ defaults.variables.LD = defaults.variables.CC
</span> defaults.web_browser = "open"
end
</pre><pre style='margin:0'>
</pre>