<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4cefa9951959e4aa00ce7f3fb12a2c608e414fe3">https://github.com/macports/macports-ports/commit/4cefa9951959e4aa00ce7f3fb12a2c608e414fe3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4cefa9951959e4aa00ce7f3fb12a2c608e414fe3
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Jan 12 23:04:47 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gate: hardcode C++17 standard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Ugly solution, but well ...
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57735
</span>---
science/gate/Portfile | 14 +++++++++++++-
science/gate/files/patch-cxxstandard.diff | 11 +++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gate/Portfile b/science/gate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02590b8..4a5c2c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ PortGroup cmake 1.1
</span> PortGroup cxx11 1.1
PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
github.setup OpenGATE Gate 8.1.p01 v
name gate
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +28,12 @@ checksums rmd160 e5b4600b4e3a0c8051a4cd1971c1a6db89400827 \
</span> sha256 fc2817fff480b6eacd53d3840c206621340eddd1153a93528dca4e2c9192562a \
size 2419444
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Force the same compiler as ROOT6 is using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/57735
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc* {clang < 900} macports-clang-3.3 macports-clang-3.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-clang-3.7 macports-clang-4.0 macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # TODO: take this data from a geant4 portgroup
set geant.data_versions_10.4 {
G4NDL 4.5 G4NDL G4NEUTRONHPDATA
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +58,12 @@ app.icon ${filespath}/gate.png
</span>
depends_lib port:root6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-addmenu.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-addmenu.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cxxstandard.diff
</span><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;'>+ reinplace "s|@@CXX_STANDARD@@|c++17|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args-append \
-DGATE_USE_OPTICAL=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gate/files/patch-cxxstandard.diff b/science/gate/files/patch-cxxstandard.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b27bd2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gate/files/patch-cxxstandard.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;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -276,7 +276,7 @@ ENDIF(GATE_DOWNLOAD_BENCHMARKS_DATA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # such warning related to clhep/g4 system of units. Additionally,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we force the c++11 std. This is mandatory for Geant4 >= 10.2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-shadow")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=@@CXX_STANDARD@@")
</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;'>+ #=========================================================
</span></pre><pre style='margin:0'>
</pre>