<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/af51a163389990896b5561d412e8f94735f29331">https://github.com/macports/macports-ports/commit/af51a163389990896b5561d412e8f94735f29331</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit af51a163389990896b5561d412e8f94735f29331
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Aug 17 17:06:16 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> plplot: ensure we are UsingTheRightCompiler
</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>---
science/plplot/Portfile | 8 +++++++-
...odules-language_support-cmake-CMakeDInformation.cmake.diff | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/Portfile b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f227256..7d3c3b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,10 +244,16 @@ variant dmd description {Add support for D} {
</span> patchfiles-append patch-cmake-modules-language_support-cmake-CMakeTestDCompiler.cmake.diff \
patch-cmake-modules-language_support-cmake-Platform-Darwin-dmd.cmake.diff \
patch-examples-d.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bindings-d-plplot.d.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bindings-d-plplot.d.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-modules-language_support-cmake-CMakeDInformation.cmake.diff
</span> configure.args-delete -DENABLE_d=OFF
configure.args-append -DENABLE_d=ON
configure.env-append D_PATH=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/wiki/UsingTheRightCompiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__MACPORTS_LINKER__|${configure.cc}|g" ${worksrcpath}/cmake/modules/language_support/cmake/CMakeDInformation.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant lua description {Add support for Lua} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeDInformation.cmake.diff b/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeDInformation.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..99e3cee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plplot/files/patch-cmake-modules-language_support-cmake-CMakeDInformation.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/language_support/cmake/CMakeDInformation.cmake.orig 2019-06-01 16:24:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/language_support/cmake/CMakeDInformation.cmake 2019-08-17 13:14:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "<CMAKE_D_COMPILER> <FLAGS> <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <LINK_LIBRARIES>")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_D_LINK_EXECUTABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "gcc ${DLINK_FLAGS} <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -lpthread -lm ${DSTDLIB_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "__MACPORTS_LINKER__ ${DLINK_FLAGS} <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -lpthread -lm ${DSTDLIB_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(CMAKE_COMPILER_IS_GDC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(NOT CMAKE_D_LINK_EXECUTABLE)
</span></pre><pre style='margin:0'>
</pre>