<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e8fbc621e61e630004dd6df9236488a2a1785c04">https://github.com/macports/macports-ports/commit/e8fbc621e61e630004dd6df9236488a2a1785c04</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e8fbc621e61e630004dd6df9236488a2a1785c04
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 11 08:21:33 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: fix build if gcc6 is selected on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since the port either builds successfully or not at all.
</span>---
math/octave/Portfile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
<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 befc544..dcba52c 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;'>@@ -576,7 +576,15 @@ foreach gccVar ${compilers.gcc_variants} {
</span> if {[vercmp ${xcodeversion} 7.0] >= 0} {
patchfiles-append patch-force_cxx.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gccMajor [string range ${gccVar} 3 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${gccMajor} == 6 && [vercmp 4.0 ${xcodeversion}] <= 0 && [vercmp ${xcodeversion} 5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in order to use Carbon framework, -fpermissive is required on macports-gcc-6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -fpermissive
</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;'>+ if {${gccMajor} < 7 && [vercmp ${xcodeversion} 8.0] >= 0} {
</span> configure.cppflags-append "-isystem ${worksrcpath}/Availability"
post-extract {
if [file exists /usr/include/AvailabilityInternal.h] {
</pre><pre style='margin:0'>
</pre>