<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67140e536e62e8628d49dd2cdc90f5132885af63">https://github.com/macports/macports-ports/commit/67140e536e62e8628d49dd2cdc90f5132885af63</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 67140e5 octave-image: respect MacPorts CXXFLAGS
</span>67140e5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67140e536e62e8628d49dd2cdc90f5132885af63
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Oct 26 05:29:20 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave-image: respect MacPorts CXXFLAGS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The patch was introduced in
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/c8c542f28c5f71ae0d8814a08507395f77da2606
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The underlying problem was fixed in
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/5c63c9706d260f6a6557b110bb7608f0d92287bf
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now, the patch causes failures on systems that use
</span><span style='display:block; white-space:pre;color:#404040;'> -stdlib=macports-libstdc++ instead of -stdlib=libc++.
</span>---
math/octave-image/Portfile | 5 ++---
math/octave-image/files/patch-src-Makefile.in.diff | 8 --------
2 files changed, 2 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/Portfile b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a7b279..6fe26fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cxx11 1.1
</span> PortGroup octave 1.0
octave.setup image 2.8.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-3+ MIT FreeBSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,6 @@ checksums rmd160 49ad88f333bdb037715d47a786cfc764d4a6d968 \
</span>
depends_lib-append port:octave-signal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-Makefile.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_connectivity.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_connectivity.cc.diff
</span>
configure.env-append "PREFIX_BIN=${prefix}/bin"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/files/patch-src-Makefile.in.diff b/math/octave-image/files/patch-src-Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eb4e793..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-image/files/patch-src-Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2016-10-21 09:19:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2016-11-01 07:38:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--FLAGGED_MKOCTFILE = @MKOCTFILE@ @XTRA_CXXFLAGS@ @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FLAGGED_MKOCTFILE = @MKOCTFILE@ @XTRA_CXXFLAGS@ -pipe -Os -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## We can't link oct files, and Octave's package system does not handle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## shared libraries. Because of this, we need to create object files for
</span></pre><pre style='margin:0'>
</pre>