<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/42374e31f2720a656a8324b57c2707dfa6123212">https://github.com/macports/macports-ports/commit/42374e31f2720a656a8324b57c2707dfa6123212</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 42374e3 python portgroup: add -stdlib to CXXFLAGS
</span>42374e3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 42374e31f2720a656a8324b57c2707dfa6123212
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jun 2 09:25:25 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> python portgroup: add -stdlib to CXXFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> New option python.set_cxx_stdlib can be set to no to disable this.
</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/56567
</span>---
_resources/port1.0/group/python-1.0.tcl | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
<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 cd56b00..4e82e68 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;'>@@ -119,22 +119,29 @@ proc python_set_versions {option action args} {
</span> }
if {[info exists addcode] && ![info exists python._addedcode]} {
pre-build {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags ""
</span> if {${python.add_archflags}} {
if {[variant_exists universal] && [variant_isset universal]} {
build.env-append CFLAGS="${configure.universal_cflags}" \
OBJCFLAGS="${configure.universal_cflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.universal_cxxflags}" \
</span> LDFLAGS="${configure.universal_ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags ${configure.universal_cxxflags}
</span> } else {
build.env-append CFLAGS="${configure.cc_archflags}" \
OBJCFLAGS="${configure.objc_archflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span> 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;'>+ set pycxxflags ${configure.cxx_archflags}
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_cxx_stdlib}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pycxxflags ne ""} {
</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;'>+ }
</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:#e0e0e0;'>@@ -144,22 +151,29 @@ proc python_set_versions {option action args} {
</span> }
}
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags ""
</span> if {${python.add_archflags} && ${python.consistent_destroot}} {
if {[variant_exists universal] && [variant_isset universal]} {
destroot.env-append CFLAGS="${configure.universal_cflags}" \
OBJCFLAGS="${configure.universal_cflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.universal_cxxflags}" \
</span> LDFLAGS="${configure.universal_ldflags}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags ${configure.universal_cxxflags}
</span> } else {
destroot.env-append CFLAGS="${configure.cc_archflags}" \
OBJCFLAGS="${configure.objc_archflags}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="${configure.cxx_archflags}" \
</span> 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;'>+ set pycxxflags ${configure.cxx_archflags}
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_cxx_stdlib}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pycxxflags ne ""} {
</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;'>+ }
</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:#e0e0e0;'>@@ -313,15 +327,16 @@ proc python_get_defaults {var} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options python.add_archflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options python.add_archflags python.set_compiler python.set_cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.link_binaries python.link_binaries_suffix \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.move_binaries python.move_binaries_suffix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default python.add_archflags yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options python.set_compiler
</span> default python.set_compiler yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default python.set_cxx_stdlib yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options python.link_binaries python.link_binaries_suffix
</span> default python.link_binaries {[python_get_defaults link_binaries]}
default python.link_binaries_suffix {[python_get_defaults binary_suffix]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options python.move_binaries python.move_binaries_suffix
</span> default python.move_binaries {[python_get_defaults move_binaries]}
default python.move_binaries_suffix {[python_get_defaults binary_suffix]}
</pre><pre style='margin:0'>
</pre>