<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/02eac73dfdc362a003adf7148df843b9a5023b31">https://github.com/macports/macports-ports/commit/02eac73dfdc362a003adf7148df843b9a5023b31</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 02eac73 python pg: include our sysroot in compiler flags
</span>02eac73 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02eac73dfdc362a003adf7148df843b9a5023b31
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Sep 23 16:54:50 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> python pg: include our sysroot in compiler flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes module build failures due to the compiler being unable to find
</span><span style='display:block; white-space:pre;color:#404040;'> headers when building with Xcode 11.
</span>---
_resources/port1.0/group/python-1.0.tcl | 88 +++++++++++++++++++++++----------
1 file changed, 62 insertions(+), 26 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 8c28f0f..e5a5f3c 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,41 +119,51 @@ 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 pycflags ""
</span> set pycxxflags ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ""
</span> if {${python.add_archflags}} {
if {[variant_exists universal] && [variant_isset universal]} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${configure.universal_ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append LDFLAGS=${configure.universal_ldflags}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append LDFLAGS="${configure.universal_ldflags}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycflags ${configure.universal_cflags}
</span> set pycxxflags ${configure.universal_cxxflags}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ${configure.universal_cflags}
</span> } else {
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append FFLAGS=${configure.f77_archflags} \
</span> F90FLAGS=${configure.f90_archflags} \
FCFLAGS=${configure.fc_archflags} \
LDFLAGS=${configure.ld_archflags}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.objc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append FFLAGS="${configure.f77_archflags}" \
</span> F90FLAGS="${configure.f90_archflags}" \
FCFLAGS="${configure.fc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycflags ${configure.cc_archflags}
</span> set pycxxflags ${configure.cxx_archflags}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ${configure.objc_archflags}
</span> }
}
if {${python.set_cxx_stdlib}} {
set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_sdkroot}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pycflags ne ""} {
</span><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=$pycflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CFLAGS="$pycflags"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {$pycxxflags ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
build.env-append CXXFLAGS=$pycxxflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,6 +171,13 @@ proc python_set_versions {option action args} {
</span> build.env-append CXXFLAGS="$pycxxflags"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pyobjcflags ne ""} {
</span><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 OBJCFLAGS=$pyobjcflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append OBJCFLAGS="$pyobjcflags"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>@@ -174,41 +191,51 @@ proc python_set_versions {option action args} {
</span> }
}
pre-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycflags ""
</span> set pycxxflags ""
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ""
</span> if {${python.add_archflags} && ${python.consistent_destroot}} {
if {[variant_exists universal] && [variant_isset universal]} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS=${configure.universal_cflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=${configure.universal_ldflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append LDFLAGS=${configure.universal_ldflags}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.universal_cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="${configure.universal_ldflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append LDFLAGS="${configure.universal_ldflags}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycflags ${configure.universal_cflags}
</span> set pycxxflags ${configure.universal_cxxflags}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ${configure.universal_cflags}
</span> } else {
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS=${configure.objc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS=${configure.f77_archflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append FFLAGS=${configure.f77_archflags} \
</span> F90FLAGS=${configure.f90_archflags} \
FCFLAGS=${configure.fc_archflags} \
LDFLAGS=${configure.ld_archflags}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CFLAGS="${configure.cc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJCFLAGS="${configure.objc_archflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FFLAGS="${configure.f77_archflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append FFLAGS="${configure.f77_archflags}" \
</span> F90FLAGS="${configure.f90_archflags}" \
FCFLAGS="${configure.fc_archflags}" \
LDFLAGS="${configure.ld_archflags}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pycflags ${configure.cc_archflags}
</span> set pycxxflags ${configure.cxx_archflags}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyobjcflags ${configure.objc_archflags}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.set_cxx_stdlib}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_cxx_stdlib} && ${python.consistent_destroot}} {
</span> set pycxxflags [portconfigure::construct_cxxflags $pycxxflags]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.set_sdkroot} && ${python.consistent_destroot}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pycxxflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append pyobjcflags " -isysroot${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pycflags ne ""} {
</span><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=$pycflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append CFLAGS="$pycflags"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {$pycxxflags ne ""} {
if {[vercmp [macports_version] 2.5.99] >= 0} {
destroot.env-append CXXFLAGS=$pycxxflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,6 +243,13 @@ proc python_set_versions {option action args} {
</span> destroot.env-append CXXFLAGS="$pycxxflags"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$pyobjcflags ne ""} {
</span><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 OBJCFLAGS=$pyobjcflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append OBJCFLAGS="$pyobjcflags"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>@@ -312,13 +346,15 @@ proc python_get_defaults {var} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options python.add_archflags python.set_compiler python.set_cxx_stdlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options python.add_archflags python.set_compiler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.set_cxx_stdlib python.set_sdkroot \
</span> python.link_binaries python.link_binaries_suffix \
python.move_binaries python.move_binaries_suffix
default python.add_archflags yes
default python.set_compiler yes
default python.set_cxx_stdlib yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default python.set_sdkroot yes
</span>
default python.link_binaries yes
default python.link_binaries_suffix {[python_get_defaults binary_suffix]}
</pre><pre style='margin:0'>
</pre>