<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53322ab4ad920d6a207363fec87717511da2c35f">https://github.com/macports/macports-ports/commit/53322ab4ad920d6a207363fec87717511da2c35f</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 53322ab libANN: Always pass CXXFLAGS to C++ compiler
</span>53322ab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 53322ab4ad920d6a207363fec87717511da2c35f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jan 5 21:49:49 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> libANN: Always pass CXXFLAGS to C++ compiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes build failure when using nonstandard C++ stdlib (e.g. 10.6-10.8).
</span>---
science/libANN/Portfile | 3 ++-
science/libANN/files/CFLAGS.patch | 44 +++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libANN/Portfile b/science/libANN/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d66b43..9cb1200 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/libANN/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libANN/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ checksums rmd160 1b76b2f5c25c83c6d52a1a1e19e5b058ccf929d0 \
</span>
patchfiles patch-Make-config.diff \
patch-ann2fig-ann2fig.cpp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-dynamic_library.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-dynamic_library.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS.patch
</span>
post-patch {
# Yes, libANN gives CFLAGS to the C++ compiler.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/libANN/files/CFLAGS.patch b/science/libANN/files/CFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..39d3fdc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/libANN/files/CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Always pass CFLAGS (which is really CXXFLAGS) to the C++ compiler.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is necessary to get the -stdlib flag.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ann2fig/Makefile.orig 2010-01-27 22:40:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ann2fig/Makefile 2020-01-05 21:11:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ targets: $(BINDIR)/$(ANN2FIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BINDIR)/$(ANN2FIG): $(OBJECTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(C++) $(OBJECTS) -o $(ANN2FIG) $(LDFLAGS) $(ANNLIBS) $(OTHERLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(C++) $(CFLAGS) $(OBJECTS) -o $(ANN2FIG) $(LDFLAGS) $(ANNLIBS) $(OTHERLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv $(ANN2FIG) $(BINDIR)
</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;'>+@@ -75,7 +75,7 @@
</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;'>+ ann2fig.o: ann2fig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(C++) -c -I$(INCDIR) ann2fig.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(C++) -c -I$(INCDIR) $(CFLAGS) ann2fig.cpp
</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;'>+ # Cleaning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sample/Makefile.orig 2010-01-27 22:40:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sample/Makefile 2020-01-05 21:10:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ targets: $(BINDIR)/$(ANNSAMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BINDIR)/$(ANNSAMP): $(SAMPOBJECTS) $(LIBDIR)/$(ANNLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(C++) $(SAMPOBJECTS) -o $(ANNSAMP) $(LDFLAGS) $(ANNLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(C++) $(CFLAGS) $(SAMPOBJECTS) -o $(ANNSAMP) $(LDFLAGS) $(ANNLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv $(ANNSAMP) $(BINDIR)
</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;'>+--- test/Makefile.orig 2010-01-27 22:40:01.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/Makefile 2020-01-05 21:07:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ targets: $(BINDIR)/$(ANNTEST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BINDIR)/$(ANNTEST): $(TESTOBJECTS) $(LIBDIR)/$(ANNLIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(C++) $(TESTOBJECTS) -o $(ANNTEST) $(LDFLAGS) $(ANNLIBS) $(OTHERLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(C++) $(CFLAGS) $(TESTOBJECTS) -o $(ANNTEST) $(LDFLAGS) $(ANNLIBS) $(OTHERLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mv $(ANNTEST) $(BINDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------------
</span></pre><pre style='margin:0'>
</pre>