<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8863962b79c56323bb4a6f9176b41844b6eeed75">https://github.com/macports/macports-ports/commit/8863962b79c56323bb4a6f9176b41844b6eeed75</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8863962b79c56323bb4a6f9176b41844b6eeed75
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Oct 3 18:15:17 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> perl5 pg: use correct sdkroot
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59154
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59131
</span>---
_resources/port1.0/group/perl5-1.0.tcl | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/perl5-1.0.tcl b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 37aa51a..f32c63a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/perl5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,11 +194,20 @@ proc perl5.setup {module vers {cpandir ""}} {
</span> # CCFLAGS can be passed in to "configure" but it's not necessarily inherited.
# LDFLAGS can't be passed in (or if it can, it's not easy to figure out how).
post-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_cflags [get_canonical_archflags cc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_ldflags [get_canonical_archflags ld]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append extra_cflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append extra_ldflags " -Wl,-syslibroot,${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append extra_cflags " -isysroot/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append extra_ldflags " -Wl,-syslibroot,/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> fs-traverse file ${configure.dir} {
if {[file isfile ${file}] && [file tail ${file}] eq "Makefile"} {
ui_info "Fixing flags in [string map "${configure.dir}/ {}" ${file}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C -q "/^CCFLAGS *=/s/$/ [get_canonical_archflags cc]/" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C -q "/^OTHERLDFLAGS *=/s/$/ [get_canonical_archflags ld]/" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C -q "/^CCFLAGS *=/s|$| ${extra_cflags}|" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C -q "/^OTHERLDFLAGS *=/s|$| ${extra_ldflags}|" ${file}
</span> }
}
}
</pre><pre style='margin:0'>
</pre>