<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/62b5f6f74b16ef21aaf49a7219d24a5553866b90">https://github.com/macports/macports-ports/commit/62b5f6f74b16ef21aaf49a7219d24a5553866b90</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 62b5f6f adapt portgroups to base command.env changes
</span>62b5f6f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62b5f6f74b16ef21aaf49a7219d24a5553866b90
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 23 21:55:27 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> adapt portgroups to base command.env changes
</span>---
_resources/port1.0/group/cargo_fetch-1.0.tcl | 9 ++++++
_resources/port1.0/group/python-1.0.tcl | 46 ++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo_fetch-1.0.tcl b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5cac5f2..4022fb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo_fetch-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +238,11 @@ foreach stage {build destroot} {
</span> }
foreach stage {configure build destroot} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${stage}.env-append "RUSTFLAGS=-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> ${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# do not force all Portfiles to switch from ${stage}.env to ${stage}.env-append
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,8 +256,13 @@ proc cargo.environments {} {
</span> }
foreach stage {configure build destroot} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${stage}.env-delete "RUSTFLAGS=-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${stage}.env-append "RUSTFLAGS=-C linker=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> ${stage}.env-delete RUSTFLAGS="-C linker=${configure.cc}"
${stage}.env-append RUSTFLAGS="-C linker=${configure.cc}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# CARGO_BUILD_TARGET does not work correctly
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/python-1.0.tcl b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e3e2d7..bba86f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/python-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,17 +122,32 @@ proc python_set_versions {option action args} {
</span> set pycxxflags ""
if {${python.add_archflags}} {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.universal_ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CFLAGS="${configure.universal_cflags}" \
OBJCFLAGS="${configure.universal_cflags}" \
LDFLAGS="${configure.universal_ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set pycxxflags ${configure.universal_cxxflags}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90FLAGS=${configure.f90_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FCFLAGS=${configure.fc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ld_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CFLAGS="${configure.cc_archflags}" \
OBJCFLAGS="${configure.objc_archflags}" \
FFLAGS="${configure.f77_archflags}" \
F90FLAGS="${configure.f90_archflags}" \
FCFLAGS="${configure.fc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set pycxxflags ${configure.cxx_archflags}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,12 +155,20 @@ proc python_set_versions {option action args} {
</span> set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
if {$pycxxflags ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CXXFLAGS=$pycxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append CXXFLAGS="$pycxxflags"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${python.set_compiler}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append [string toupper $var]=[set configure.${var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> build.env-append [string toupper $var]="[set configure.${var}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,17 +177,32 @@ proc python_set_versions {option action args} {
</span> set pycxxflags ""
if {${python.add_archflags} && ${python.consistent_destroot}} {
if {[variant_exists universal] && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.universal_ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append CFLAGS="${configure.universal_cflags}" \
OBJCFLAGS="${configure.universal_cflags}" \
LDFLAGS="${configure.universal_ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set pycxxflags ${configure.universal_cxxflags}
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ F90FLAGS=${configure.f90_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FCFLAGS=${configure.fc_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS=${configure.ld_archflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append CFLAGS="${configure.cc_archflags}" \
OBJCFLAGS="${configure.objc_archflags}" \
FFLAGS="${configure.f77_archflags}" \
F90FLAGS="${configure.f90_archflags}" \
FCFLAGS="${configure.fc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set pycxxflags ${configure.cxx_archflags}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,12 +210,20 @@ proc python_set_versions {option action args} {
</span> set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
if {$pycxxflags ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CXXFLAGS=$pycxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append CXXFLAGS="$pycxxflags"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${python.set_compiler} && ${python.consistent_destroot}} {
foreach var {cc objc cxx fc f77 f90} {
if {[set configure.${var}] ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.5.99] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append [string toupper $var]=[set configure.${var}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span> destroot.env-append [string toupper $var]="[set configure.${var}]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
</pre><pre style='margin:0'>
</pre>