<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/74758a632bdd34f589ce515da794266888fd4ca8">https://github.com/macports/macports-ports/commit/74758a632bdd34f589ce515da794266888fd4ca8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 74758a632bdd34f589ce515da794266888fd4ca8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 4 00:00:54 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> opendx: respect MacPorts C compiler value
</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/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/35538
</span>---
science/opendx/Portfile | 4 +++-
science/opendx/files/patch-correct_compiler.diff | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opendx/Portfile b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ce69cf..af19a46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,10 @@ patchfiles configure.ac.diff \
</span>
# see https://trac.macports.org/ticket/56716
# fix missing -c flag
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/35538
</span> patchfiles-append patch-no_macos.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-compile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-compile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-correct_compiler.diff
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opendx/files/patch-correct_compiler.diff b/science/opendx/files/patch-correct_compiler.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..594d73f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opendx/files/patch-correct_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uipp/java/Makefile.am~ 2018-11-03 21:18:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uipp/java/Makefile.am 2018-11-03 21:26:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`ls ../dxl/.libs/*.o` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`echo $$jObjs |sed -e "s&[^ ]*object\.o&&" -e "s&[^ ]*dylib[^ ]*\.o&&" -e "s&[^ ]*x11\.o&&"` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cc -bundle -o libAnyDX.jnilib -framework JavaVM $${jObjs} DXLink.o -L/usr/X11R6/lib -lXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -bundle -o libAnyDX.jnilib -framework JavaVM $${jObjs} DXLink.o -L/usr/X11R6/lib -lXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usual_shared_object: DXLink.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`ls ../dxl/*.o` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/uipp/java/Makefile.in~ 2018-11-03 21:18:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/uipp/java/Makefile.in 2018-11-03 21:26:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -644,7 +644,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`ls ../dxl/.libs/*.o` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`echo $$jObjs |sed -e "s&[^ ]*object\.o&&" -e "s&[^ ]*dylib[^ ]*\.o&&" -e "s&[^ ]*x11\.o&&"` ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cc -bundle -o libAnyDX.jnilib -framework JavaVM $${jObjs} DXLink.o -L/usr/X11R6/lib -lXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -bundle -o libAnyDX.jnilib -framework JavaVM $${jObjs} DXLink.o -L/usr/X11R6/lib -lXt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ usual_shared_object: DXLink.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jObjs=`ls ../dxl/*.o` ; \
</span></pre><pre style='margin:0'>
</pre>