<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e1d45cfc35edb169ddd0152ed97fee2f126be015">https://github.com/macports/macports-ports/commit/e1d45cfc35edb169ddd0152ed97fee2f126be015</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 e1d45cf terra: add full stdlib flags to clang builds
</span>e1d45cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e1d45cfc35edb169ddd0152ed97fee2f126be015
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Apr 15 21:47:19 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> terra: add full stdlib flags to clang builds
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> use correct std setting for clang and gcc builds
</span><span style='display:block; white-space:pre;color:#404040;'> bump revision
</span>---
gis/terra/Portfile | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/terra/Portfile b/gis/terra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c160804..f735062 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/terra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cxx11 1.1
</span>
name terra
version 0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
categories gis science
maintainers {gmail.com:tlockhart1976 @lockhart} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,14 +32,22 @@ depends_lib port:freeglut
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add proper stdlib and set std=c++11 if building with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx ${configure.cxx} -stdlib=${configure.cxx_stdlib} -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc requires std=gnu++11 to enable build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx ${configure.cxx} -std=gnu++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
patchfiles patch-compiler.diff patch-opengl.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# add proper archflags set compiler for build
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,@CC@,${configure.cc},g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s,@CXX@,${configure.cxx},g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s,@CC@,${configure.cc} [get_canonical_archflags cc],g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s,@CXX@,${configure.cxx} [get_canonical_archflags cxx],g" ${worksrcpath}/Makefile
</span> reinplace -E "s,@OPTFLAGS@,${configure.optflags},g" ${worksrcpath}/Makefile
reinplace -E "s,@PREFIX@,${prefix},g" ${worksrcpath}/Makefile
}
</pre><pre style='margin:0'>
</pre>