<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc1f10ab3b4ea2bbdb8b4223c43ab815519ad9e8">https://github.com/macports/macports-ports/commit/cc1f10ab3b4ea2bbdb8b4223c43ab815519ad9e8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc1f10ab3b4ea2bbdb8b4223c43ab815519ad9e8
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Apr 14 16:28:31 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm/clang/lldb-5.0: remove references to svn
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> no longer relevant, no longer supported
</span>---
lang/llvm-5.0/Portfile | 91 ++++++--------------------------------------------
1 file changed, 10 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-5.0/Portfile b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5f769b773b..7ac378dd972 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-5.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,29 +93,12 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> depends_lib-append port:libedit port:libffi port:ncurses port:zlib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#fetch.type svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#svn.revision 310776
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_extract-append port:subversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#set compiler_rt_rev ${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#set libcxx_rev ${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#set clang-modernize_rev ${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#version ${llvm_version}-r${svn.revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#worksrcdir trunk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#svn.url https://llvm.org/svn/llvm-project/llvm/trunk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#worksrcdir release_${llvm_version_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#svn.url https://llvm.org/svn/llvm-project/llvm/branches/release_${llvm_version_no_dot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#default_variants-append +assertions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#default_variants-append +debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # the backtik pkgconfig setting in the ffi config line requires pkg-config
depends_build-append port:pkgconfig
version ${llvm_version}.2
epoch 2
master_sites https://releases.llvm.org/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#master_sites https://prereleases.llvm.org/${llvm_version}.0/rc4
</span> use_xz yes
extract.suffix .tar.xz
distfiles llvm-${version}.src${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,19 +171,6 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
3004-compiler-rt-leopard-no-libdispatch.patch \
openmp-locations.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://llvm.org/bugs/show_bug.cgi?id=25681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk" || ${worksrcdir} eq "release_${llvm_version_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cannot set cppflags due to https://cmake.org/Bug/view.php?id=12928
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cannot set cxxflags due to https://llvm.org/bugs/show_bug.cgi?id=25904
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.cxxflags-append -DSVN_REVISION='"${svn.revision}"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "1 i \\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SVN_REVISION \"${svn.revision}\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${worksrcpath}/tools/clang/lib/Basic/Version.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${subport} eq "lldb-${llvm_version}"} {
# lldb needs the clang sources present, so we apply the applicable patches.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -216,19 +186,6 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> 4001-https-llvm.org-bugs-show_bug.cgi-id-31433.patch \
4002-Fix-build-on-Mountain-Lion.patch \
openmp-locations.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://llvm.org/bugs/show_bug.cgi?id=25681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk" || ${worksrcdir} eq "release_${llvm_version_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cannot set cppflags due to https://cmake.org/Bug/view.php?id=12928
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Cannot set cxxflags due to https://llvm.org/bugs/show_bug.cgi?id=25904
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.cxxflags-append -DSVN_REVISION='"${svn.revision}"'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "1 i \\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SVN_REVISION \"${svn.revision}\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${worksrcpath}/tools/clang/lib/Basic/Version.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.post_args ../${worksrcdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,10 +320,10 @@ if {[lsearch -exact $PortInfo(depends_build) port:cctools] != -1} {
</span>
# use the system python27 if present
if {${os.platform} eq "darwin" && ${os.major} >= 11} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonfullpath /usr/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath /usr/bin/python2.7
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pythonfullpath ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python27
</span> }
configure.args-append -DPYTHON_EXECUTABLE=${pythonfullpath}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,46 +407,18 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get HTTP proxy arguments if required, assuming we can use the same proxy for all repositories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set proxy_args [portfetch::svn_proxy_args https://llvm.org/svn/llvm-project/cfe/trunk]
</span> if {${subport} eq "llvm-${llvm_version}"} {
if {[variant_isset polly]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/polly/trunk polly"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/polly/branches/release_${llvm_version_no_dot} polly"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/polly-${version}.src ${worksrcpath}/tools/polly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/polly-${version}.src ${worksrcpath}/tools/polly
</span> }
} elseif {${subport} eq "clang-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/cfe/trunk clang"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${compiler_rt_rev} https://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${libcxx_rev} https://llvm.org/svn/llvm-project/libcxx/trunk libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools/clang/tools "svn ${proxy_args} co -r ${clang-modernize_rev} https://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${compiler_rt_rev} https://llvm.org/svn/llvm-project/compiler-rt/branches/release_${llvm_version_no_dot} compiler-rt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/projects "svn ${proxy_args} co -r ${libcxx_rev} https://llvm.org/svn/llvm-project/libcxx/branches/release_${llvm_version_no_dot} libcxx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools/clang/tools "svn ${proxy_args} co -r ${clang-modernize_rev} https://llvm.org/svn/llvm-project/clang-tools-extra/branches/release_${llvm_version_no_dot} extra"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/cfe-${version}.src ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/compiler-rt-${version}.src ${worksrcpath}/projects/compiler-rt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/libcxx-${version}.src ${worksrcpath}/projects/libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/clang-tools-extra-${version}.src ${worksrcpath}/tools/clang/tools/extra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/cfe-${version}.src ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/compiler-rt-${version}.src ${worksrcpath}/projects/compiler-rt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/libcxx-${version}.src ${worksrcpath}/projects/libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/clang-tools-extra-${version}.src ${worksrcpath}/tools/clang/tools/extra
</span> } elseif {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/cfe/trunk clang"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/lldb/trunk lldb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${worksrcdir} eq "release_${llvm_version_no_dot}" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/cfe/branches/release_${llvm_version_no_dot} clang"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/tools "svn ${proxy_args} co -r ${svn.revision} https://llvm.org/svn/llvm-project/lldb/branches/release_${llvm_version_no_dot} lldb"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/cfe-${version}.src ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/lldb-${version}.src ${worksrcpath}/tools/lldb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/cfe-${version}.src ${worksrcpath}/tools/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/lldb-${version}.src ${worksrcpath}/tools/lldb
</span> }
}
</pre><pre style='margin:0'>
</pre>