<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b5705597236f14f1c6379a5e60978134a462ae8e">https://github.com/macports/macports-ports/commit/b5705597236f14f1c6379a5e60978134a462ae8e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b5705597236f14f1c6379a5e60978134a462ae8e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 29 08:27:22 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> gdal: Don't add -stdlib flag until pre-configure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This port has gcc variants (which change the chosen compiler) so wait
</span><span style='display:block; white-space:pre;color:#404040;'> until pre-configure time to inspect the compiler value.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59989
</span>---
gis/gdal/Portfile | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9abbefa4963..739c85396b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,13 +37,6 @@ checksums rmd160 efccd737eae5b4cb996fee9d0b21f485015e24be \
</span>
worksrcdir ${worksrcpath}/gdal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/56517
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/60625
patchfiles-append patch-charls-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,6 +137,11 @@ if {${configure.cxx_stdlib} eq "libc++"} {
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/56517
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> global worksrcpath_dirs
if { ![variant_isset universal] } {
set worksrcpath_dirs ${worksrcpath}
</pre><pre style='margin:0'>
</pre>