<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/ca2cdeb4e9bfb5054fb63044a72407891a68f00e">https://github.com/macports/macports-ports/commit/ca2cdeb4e9bfb5054fb63044a72407891a68f00e</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 ca2cdeb gmic 2.1.8: fix build issue due to unneeded -stdlib=libc++
</span>ca2cdeb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ca2cdeb4e9bfb5054fb63044a72407891a68f00e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Jan 7 16:07:25 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmic 2.1.8: fix build issue due to unneeded -stdlib=libc++
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> rename patch file
</span>---
science/gmic/Portfile | 3 ++-
science/gmic/files/Makefile.patch | 11 -----------
science/gmic/files/patch-src-Makefile.diff | 28 ++++++++++++++++++++++++++++
3 files changed, 30 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68f3f0c..9a4533e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup cxx11 1.0
</span>
name gmic
version 2.1.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license CeCILL
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +49,7 @@ depends_lib port:fftw-3 \
</span> port:xorg-libXext \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-Makefile.diff
</span>
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/Makefile.patch b/science/gmic/files/Makefile.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4f4e5f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2017-12-21 06:36:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2017-12-22 05:22:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) cli lib gimp_gtk gimp_qt krita_qt gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) cli lib gimp_gtk libc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- native:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli gimp_gtk
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-src-Makefile.diff b/science/gmic/files/patch-src-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2c5caea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2018-01-02 04:35:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2018-01-06 12:03:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,11 +167,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Unix)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDATORY_CFLAGS += -Dcimg_use_vt100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MANDATORY_CFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MANDATORY_CFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(OS),Windows)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDATORY_LIBS += -Wl,--stack,16777216
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "**"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) cli lib gimp_gtk gimp_qt krita_qt gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(MAKE) cli lib gimp_gtk libc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ native:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli gimp_gtk
</span></pre><pre style='margin:0'>
</pre>