<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/9d8991087fc722d5572da2817f5ac4ab32f19f52">https://github.com/macports/macports-ports/commit/9d8991087fc722d5572da2817f5ac4ab32f19f52</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9d8991087fc722d5572da2817f5ac4ab32f19f52
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 11 08:28:45 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> openmpi: add subports for Clang 8
</span>---
science/openmpi/Portfile | 9 +++++++++
science/openmpi/files/openmpi-clang80 | 11 +++++++++++
science/openmpi/files/openmpi-clang80-fortran | 11 +++++++++++
science/openmpi/files/openmpi-devel-clang80 | 11 +++++++++++
science/openmpi/files/openmpi-devel-clang80-fortran | 11 +++++++++++
science/openmpi/files/patch-configure.diff | 14 ++++++++++++++
6 files changed, 67 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/Portfile b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f26df9b..446a2bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,6 +68,7 @@ array set clist {
</span> clang50 {macports-clang-5.0}
clang60 {macports-clang-6.0}
clang70 {macports-clang-7.0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang80 {macports-clang-8.0}
</span> gcc43 {macports-gcc-4.3}
gcc44 {macports-gcc-4.4}
gcc45 {macports-gcc-4.5}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +96,14 @@ pre-extract { file mkdir ${workpath}/build }
</span> compiler.blacklist gcc-4.0
compiler.blacklist-append llvm-gcc-4.2 macports-llvm-gcc-4.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# For reasons that are not entirely clear, -I${worksrcpath} is added to the CPPFLAGS by the configure script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# In ${worksrcpath}, there is a file called VERSION.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# C++ has a standard library header version (https://en.cppreference.com/w/cpp/header/version).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Starting with Clang 8.0, version was included in other standard header files (https://reviews.llvm.org/D51955).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# With a case-insensitive file system, VERSION is used instead of version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is an ugly workaround.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.dir ${workpath}/build
configure.cmd ${worksrcpath}/configure
configure.args --disable-mpi-fortran \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang80 b/science/openmpi/files/openmpi-clang80
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ec7283c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/files/openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicc-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicxx-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpiexec-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpirun-openmpi-clang80
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-clang80/pkgconfig/ompi.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-clang80/pkgconfig/orte.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-clang80-fortran b/science/openmpi/files/openmpi-clang80-fortran
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c998c4f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/files/openmpi-clang80-fortran
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicc-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicxx-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpiexec-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpirun-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpif77-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpif90-openmpi-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-clang80/pkgconfig/ompi.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-clang80/pkgconfig/orte.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpifort-openmpi-clang80
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-devel-clang80 b/science/openmpi/files/openmpi-devel-clang80
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d0ed410
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/files/openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicc-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicxx-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpiexec-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpirun-openmpi-devel-clang80
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-devel-clang80/pkgconfig/ompi.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-devel-clang80/pkgconfig/orte.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/openmpi-devel-clang80-fortran b/science/openmpi/files/openmpi-devel-clang80-fortran
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d5e5c56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/files/openmpi-devel-clang80-fortran
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicc-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpicxx-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpiexec-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpirun-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpif77-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpif90-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-devel-clang80/pkgconfig/ompi.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lib/openmpi-devel-clang80/pkgconfig/orte.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/mpifort-openmpi-devel-clang80
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openmpi/files/patch-configure.diff b/science/openmpi/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d28aef7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openmpi/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-09-12 14:34:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-05-10 09:43:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363539,9 +363539,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rather than have successive assignments to these shell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variables, lest the $(foo) names try to get evaluated here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Yuck!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_builddir)/orte/include -I$(top_srcdir)/ompi/include -I$(top_srcdir)/oshmem/include'" $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS='-idirafter$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_builddir)/orte/include -I$(top_srcdir)/ompi/include -I$(top_srcdir)/oshmem/include'" $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # C++ is only relevant if we're building OMPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CXXCPPFLAGS='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'" $CXXCPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXCPPFLAGS='-idirafter$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/opal/include -I$(top_srcdir)/orte/include -I$(top_srcdir)/ompi/include'" $CXXCPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS='-I$(top_srcdir) -I$(top_srcdir)/orte/include'" $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # C++ is only relevant if we're building OMPI
</span></pre><pre style='margin:0'>
</pre>