<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4688eccf671196a069ea91583ad67bdf1fa8efe9">https://github.com/macports/macports-ports/commit/4688eccf671196a069ea91583ad67bdf1fa8efe9</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 4688ecc libomp[-devel]: Update to 6.0.0 and latest.
</span>4688ecc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4688eccf671196a069ea91583ad67bdf1fa8efe9
</span>Author: Eric A. Borisch <borisch.eric@mayo.edu>
AuthorDate: Sat Apr 14 20:59:35 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> libomp[-devel]: Update to 6.0.0 and latest.
</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/56293
</span>---
lang/libomp/Portfile | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libomp/Portfile b/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f9606b..83243fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
name libomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers eborisch openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {eborisch @eborisch} openmaintainer
</span> homepage http://openmp.llvm.org
description The OpenMP subproject of LLVM
long_description ${description} is intended to contain all of the\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,25 +23,26 @@ license {MIT NCSA}
</span>
subport libomp-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "libomp-devel" } {
</span> if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} eq "libstdc++"} {
version 291764
replaced_by libomp
} else {
conflicts libomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup llvm-mirror openmp 31535f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir openmp-${version}/runtime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 312539
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup llvm-mirror openmp feadeef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir openmp-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 329928
</span> revision 0
name ${subport}
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d5f737202375c175bac691bb3b603b48f6f09d6b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c70c90611b7363d08aae137cb5979934f4c010c13e6c9a2de232251d73a5d72
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 41fb67de6ff9655c4c782bb180baed52c9173ed6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0efe16f32a5f0b2107774a42ae019532770a949bcb8fb3fa421c020ed15e6259
</span>
livecheck.url \
http://llvm.org/viewvc/llvm-project/openmp/trunk/?view=log
livecheck.version ${version}
livecheck.regex revision=(\[0-9\]+)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rtpath "runtime/"
</span> }
} else {
conflicts libomp-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,17 +52,18 @@ if {${subport} ne ${name}} {
</span> # these systems. https://trac.macports.org/ticket/52554
configure.cflags-append -stdlib=libc++
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 6.0.0
</span> revision 0
master_sites https://releases.llvm.org/${version}
distname openmp-${version}.src
use_xz yes
dist_subdir openmp-release
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c291ee1b7fcfae30d49788a24c7395000fb8ec2e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 adb635cdd2f9f828351b1e13d892480c657fb12500e69c70e007bddf0fca2653
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 09f2a0d8a2fd317ec583d59d5142f74fec2b9d1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7c0e050d5f7da3b057579fb3ea79ed7dc657c765011b402eb5bbe5663a7c38fc
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${distname}/runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rtpath "runtime/"
</span> } else {
# Last version working on libstdc++
github.setup llvm-mirror openmp 381 svn-tags/RELEASE_
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +73,7 @@ if {${subport} ne ${name}} {
</span> checksums \
rmd160 a41054068a127ef84610afef8090109078cb6c46 \
sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rtpath "./"
</span> }
# Moved to epoch 1 for svn # -> version # change.
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +90,7 @@ compiler.blacklist-append {clang < 500} *gcc*
</span>
# Avoid dependency cycle
# https://trac.macports.org/ticket/53110
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach ver {3.8 3.9 4.0 5.0 devel} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach ver {3.8 3.9 4.0 5.0 6.0 devel} {
</span> if {![file exists ${prefix}/bin/clang-mp-${ver}]} {
compiler.blacklist-append macports-clang-${ver}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +112,7 @@ configure.args-delete -DCMAKE_INSTALL_RPATH=${prefix}/lib \
</span> # final destination we move them to
configure.args-append -DCMAKE_INSTALL_RPATH=${prefix}/lib/libomp \
-DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBOMP_OMPT_SUPPORT=FALSE
</span>
variant top_level description \
"Install (links to) omp.h and libs into ${prefix}/(include|lib)" {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,14 +120,12 @@ variant top_level description \
</span> post-extract {
# Patch tool for build with CMAKE_INSTALL_PREFIX
reinplace "/bulk.*compatibility/s/s\+/s+.*/" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/check-depends.pl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${rtpath}tools/check-depends.pl
</span> }
post-destroot {
set instdest ${destroot}${prefix}
xinstall -d ${instdest}/share/doc/libomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/README.txt ${worksrcpath}/../LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/../www ${instdest}/share/doc/libomp/
</span> xinstall -d ${instdest}/include/libomp
move ${instdest}/tmp/include/omp.h ${instdest}/include/libomp/
xinstall -d ${instdest}/lib/libomp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,6 +140,12 @@ post-destroot {
</span> "ln -s libomp/${p}"
}
}
<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;'>+ set fpath ${worksrcpath}/${rtpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${fpath}/README.txt ${fpath}/../LICENSE.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${fpath}/../www ${instdest}/share/doc/libomp/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
notes "
</pre><pre style='margin:0'>
</pre>