<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7ea864453d4e0eb23e168215a183c492f408c83a">https://github.com/macports/macports-ports/commit/7ea864453d4e0eb23e168215a183c492f408c83a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7ea864453d4e0eb23e168215a183c492f408c83a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 12 05:29:41 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: use compiler that works for OS and cxx_stdlib values
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For a full build, octave requires a C++11 compatible compiler
</span><span style='display:block; white-space:pre;color:#404040;'> with the same standard library (libc++ or libstdc++) as its
</span><span style='display:block; white-space:pre;color:#404040;'> dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/53044
</span>---
math/octave/Portfile | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dcea094..f2d1c2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,9 @@ PortGroup linear_algebra 1.0
</span> # Octave requires c++-11 but can not use cxx11 PortGroup because Octave also
# requires fortran from gcc
# Compilers supporting C++11 are GCC >= 4.6 and clang >= 3.3.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/53044 for restricting clang versions further
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {*gcc-3*} {*gcc-4.[0-5]} {clang < 500} cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {*gcc-3*} {*gcc-4.[0-6]} {clang < 700} cc
</span>
name octave
version 4.2.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -533,6 +534,16 @@ if {${magickDefault}} {
</span> default_variants-append +graphicsmagick
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset graphicsmagick] && ${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {macports-clang-*}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# put any startup commands in ${destroot}${prefix}/share/octave/${version}/m/startup/octaverc
# see https://www.gnu.org/software/octave/doc/interpreter/Startup-Files.html
</pre><pre style='margin:0'>
</pre>