<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/62721de0394d8a52da9922b85e4fde1420c1f172">https://github.com/macports/macports-ports/commit/62721de0394d8a52da9922b85e4fde1420c1f172</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 62721de0394d8a52da9922b85e4fde1420c1f172
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 6 11:46:35 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> janet PG: Use compiler_wrapper PG to generate compiler wraps
</span>---
_resources/port1.0/group/janet-1.0.tcl | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/janet-1.0.tcl b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c658300dd78..77d805399c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/janet-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,14 +7,13 @@
</span> # (see https://janet-lang.org/docs/jpm.html).
#
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_wrapper 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compwrap.print_compiler_command no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # search in ${prefix}/lib/janet/bin and create link in ${prefix}/bin
options janet.link_bin
default janet.link_bin yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# program to create and maintain library archives
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-options janet.compiler.ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default janet.compiler.ar {[janetpg::get_default_ar]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> namespace eval janetpg {
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,29 +26,24 @@ proc janetpg::get_default_ar {} {
</span> # You can set the compilers, but no spaces seem to be allowed.
# Hence, we cannot simply append the CFLAGS/CXXFLAGS to the compiler name.
# As a workaround, create custom compilers with CFLAGS/CXXFLAGS baked in.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # create directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${worksrcpath}/macports_bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # create empty files with the correct permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin {cc cxx ar} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close [open ${worksrcpath}/macports_bin/${bin} w 0755]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use compiler_wrapper PG to do this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Generate the wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin {cc cxx} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compwrap::create_wrapper ${bin}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.pre_args {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.cmd {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/echo \\\\#!/bin/bash >> ${worksrcpath}/macports_bin/cc && echo exec \\\$CC \\\$CFLAGS \\\\\"\\\\$@\\\\\" >> ${worksrcpath}/macports_bin/cc &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/echo \\\\#!/bin/bash >> ${worksrcpath}/macports_bin/cxx && echo exec \\\$CXX \\\$CXXFLAGS \\\\\"\\\\$@\\\\\" >> ${worksrcpath}/macports_bin/cxx &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/echo \\\\#!/bin/bash >> ${worksrcpath}/macports_bin/ar && echo exec ${janet.compiler.ar} \\\\\"\\\\$@\\\\\" >> ${worksrcpath}/macports_bin/ar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.post_args {}
</span>
# Build with jpm.
default build.cmd {${prefix}/bin/jpm}
default build.args {--verbose
--offline
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --compiler=${worksrcpath}/macports_bin/cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --cpp-compiler=${worksrcpath}/macports_bin/cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --archiver=${worksrcpath}/macports_bin/ar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --compiler=[compwrap::wrapper_path cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --cpp-compiler=[compwrap::wrapper_path cxx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --archiver=[janetpg::get_default_ar]
</span> build
}
default build.target {}
</pre><pre style='margin:0'>
</pre>