<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/c4623968644f83cacb35b07c586bfa6aa893f64c">https://github.com/macports/macports-ports/commit/c4623968644f83cacb35b07c586bfa6aa893f64c</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 c462396 libomp: Use canonical llvm-project github account. (#6560)
</span>c462396 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c4623968644f83cacb35b07c586bfa6aa893f64c
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Fri Mar 13 21:43:36 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> libomp: Use canonical llvm-project github account. (#6560)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Updated libomp-devel to 10.0.0-rc3
</span><span style='display:block; white-space:pre;color:#404040;'> Refactored to reduce duplication
</span>---
lang/libomp/Portfile | 102 ++++++++++++++++++++++++---------------------------
1 file changed, 47 insertions(+), 55 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 245710a..288cdc3 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;'>@@ -22,73 +22,64 @@ platforms darwin
</span> supported_archs i386 x86_64
license {MIT NCSA}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Moved to epoch 1 for svn # -> version # change.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport libomp-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} eq "libomp-devel" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 291764
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${subport} eq "libomp-devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 10.0.0-rc3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 24b50ccf7264748452154a4c9a5c728a8844f350 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4b56ff1cff324cc69c783a3dd56305078c8cb92fc59fee494e736714b2eaad2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 958880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {"llvmorg-([0-9.rc-]+)".*}
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Moved to official llvm github project. It would be a very large
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (100MB+) download, so use the svn interface (!) to github to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # download just the openmp directory. Not using LLVM's own SVN since
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # they are in the process of migrating to github.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fetch.type svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.url https://github.com/llvm/llvm-project/trunk/openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn.revision 327229
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # llvm-svn revision; also used for livecheck
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 367070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name ${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://llvm.org/viewvc/llvm-project/openmp/trunk/?view=log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex revision=(\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rtpath "runtime/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libomp-use-gettid-on-Leopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 9.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e5562fce183a9838d412d4e60c5afb41607b0c37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5c94060f846f965698574d9ce22975c0e9f04c9b14088c3af5f03870af75cace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 938360
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {"llvmorg-([0-9.]+)".*}
</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;'>+ if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # kmp_alloc.c includes <atomic> but libc++ is not the default on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these systems. https://trac.macports.org/ticket/52554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -stdlib=libc++
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/llvm/llvm-project/releases/download/llvmorg-${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://releases.llvm.org/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname openmp-[strsed ${version} {s/-//}].src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_subdir openmp-release
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-libomp-use-gettid-on-Leopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://api.github.com/repos/llvm/llvm-project/tags
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts libomp-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # kmp_alloc.c includes <atomic> but libc++ is not the default on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # these systems. https://trac.macports.org/ticket/52554
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 9.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://github.com/llvm/llvm-project/releases/download/llvmorg-${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://releases.llvm.org/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname openmp-${version}.src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist_subdir openmp-release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 43db5865294f92a8c724ec3e83d500263b32ff59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9979eb1133066376cc0be29d1682bc0b0e7fb541075b391061679111ae4d3b5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 939036
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rtpath "runtime/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-libomp-use-gettid-on-Leopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${subport} eq "libomp-devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 291764
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by libomp
</span> } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span> # Last version working on libstdc++
github.setup llvm-mirror openmp 381 svn-tags/RELEASE_
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ name libomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> worksrcdir openmp-${version}/final/runtime
version 3.8.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span> checksums \
rmd160 a41054068a127ef84610afef8090109078cb6c46 \
sha256 4c46b5946fe9b2a701661746d11c7c85c51a7f18673194a7ebd2a43470948a34
set rtpath "./"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Moved to epoch 1 for svn # -> version # change.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name libomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version [strsed ${version} {g/\.//}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://github.com/llvm-mirror/openmp/branches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex svn-tags/RELEASE_(\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
depends_build-append port:perl5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +114,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:#ffe0e0;'>- -DLIBOMP_OMPT_SUPPORT=FALSE
</span><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;'>@@ -140,9 +131,11 @@ post-destroot {
</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:#e0ffe0;'>+
</span> foreach p {libiomp5.dylib libomp.dylib libgomp.dylib} {
move ${instdest}/tmp/lib/${p} ${instdest}/lib/libomp/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if [variant_isset top_level] {
system -W ${instdest}/include \
"ln -s libomp/omp.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,11 +145,10 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set fpath ${worksrcpath}/${rtpath}
file copy ${fpath}/README.txt ${fpath}/../LICENSE.txt \
${fpath}/../www ${instdest}/share/doc/libomp/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
notes "
</pre><pre style='margin:0'>
</pre>