<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/690512f6d91035b7d21d8b8ef64a5f14f5dde16a">https://github.com/macports/macports-ports/commit/690512f6d91035b7d21d8b8ef64a5f14f5dde16a</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 690512f llvm-3.[456]: Remove +polly variant
</span>690512f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 690512f6d91035b7d21d8b8ef64a5f14f5dde16a
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Mar 5 14:27:38 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> llvm-3.[456]: Remove +polly variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It does not work with recent isl updates. Users interested in polly probably
</span><span style='display:block; white-space:pre;color:#404040;'> don't want these stale versions anyways.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
lang/llvm-3.4/Portfile | 33 ++-------------------------------
lang/llvm-3.5/Portfile | 30 +++---------------------------
lang/llvm-3.6/Portfile | 33 +++------------------------------
3 files changed, 8 insertions(+), 88 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 60e545d..28c2332 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,11 +79,7 @@ distfiles llvm-${version}.src${extract.suffix}
</span> worksrcdir llvm-${version}.src
if {${distfiles} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append polly-${llvm_version}.src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${llvm_version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${llvm_version}.src${extract.suffix}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,9 +87,6 @@ if {${distfiles} ne ""} {
</span> checksums llvm-3.4.2.src.tar.gz \
rmd160 5fab44850977afccee34b21c6d339bc8dea21fce \
sha256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- polly-3.4.src.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 995dc606934494344e2bdc20c1d1f49bf0cedd3c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f1a5fb73dddc0afe47a0f4108dea818e0d1d16485899141957f87f75fa50ee7 \
</span> cfe-3.4.2.src.tar.gz \
rmd160 f6b177408f5f9d3a453d41f1f60534f8e1e2845b \
sha256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -264,17 +257,7 @@ platform darwin {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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 "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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-${llvm_version} ${worksrcpath}/tools/polly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> if {${worksrcdir} eq "trunk"} {
system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,18 +323,6 @@ post-destroot {
</span> }
if {${subport} eq "llvm-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant polly description {Provide the polly polyhedral optimizer} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append polly-isl-0.13.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:isl14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cloog-isl.pc:cloog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${prefix}/libexec/isl14/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${prefix}/libexec/isl14/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant ocaml description {Enable generation of OCaml binding} {
depends_lib-append port:ocaml
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.5/Portfile b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5bacd3c..6af8cc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +83,7 @@ distfiles llvm-${version}.src${extract.suffix}
</span> worksrcdir llvm-${version}.src
if {${distfiles} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append polly-${version}.src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,10 +102,7 @@ checksums llvm-3.5.2.src.tar.xz \
</span> sha256 bbf1269de11f43fe766c7ff108ec076d16ec9ddd4e929eec87027eee48a13647 \
clang-tools-extra-3.5.2.src.tar.xz \
rmd160 8b8dc7835393863e5c22e8f7c35a61330e0ad425 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- polly-3.5.2.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ba98b905524b33a2489164e5fd8739b163eb0b19 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9d2a4bb8607e0879a0537165b9c2af7cfe4cc998627a62951106bffa1929dbe8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,17 +268,7 @@ platform darwin {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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 "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> if {${worksrcdir} eq "trunk"} {
system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,13 +323,6 @@ post-destroot {
</span> }
if {${subport} eq "llvm-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant polly description {Provide the polly polyhedral optimizer} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/isl.pc:isl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cloog-isl.pc:cloog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant ocaml description {Enable generation of OCaml binding} {
depends_lib-append port:ocaml
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-3.6/Portfile b/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cde51c..af4bebd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-3.6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,11 +83,7 @@ distfiles llvm-${version}.src${extract.suffix}
</span> worksrcdir llvm-${version}.src
if {${distfiles} ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append polly-${version}.src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> distfiles-append cfe-${version}.src${extract.suffix} compiler-rt-${version}.src${extract.suffix} libcxx-${version}.src${extract.suffix} clang-tools-extra-${version}.src${extract.suffix}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,10 +102,7 @@ checksums llvm-3.6.2.src.tar.xz \
</span> sha256 52f3d452f48209c9df1792158fdbd7f3e98ed9bca8ebb51fcd524f67437c8b81 \
clang-tools-extra-3.6.2.src.tar.xz \
rmd160 4e56b0d5a8056c3800522efb9cc4d52c94ab2af2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- polly-3.6.2.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 59515632836a37c2790677b5b332868578528e31 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2a956730b76212f22a1c10f35f195795e4d027ad28c226f97ddb8c0fd16bcbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb
</span>
patch.pre_args -p1
patchfiles \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,17 +252,7 @@ platform darwin {
</span> }
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq "llvm-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset polly]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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 "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${subport} eq "clang-${llvm_version}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "clang-${llvm_version}"} {
</span> if {${worksrcdir} eq "trunk"} {
system "cd ${worksrcpath}/tools && svn co -r ${svn.revision} http://llvm.org/svn/llvm-project/cfe/trunk clang"
system "cd ${worksrcpath}/projects && svn co -r ${compiler_rt_rev} http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,16 +307,6 @@ post-destroot {
</span> }
if {${subport} eq "llvm-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant polly description {Provide the polly polyhedral optimizer} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${worksrcdir} eq "trunk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Polly likes using bleeding-edge isl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:isl-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/isl.pc:isl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Unless upstream reverts to their old OCaml detection mechanism,
# this variant will be broken until #46161 is resolved.
variant ocaml description {Enable generation of OCaml binding} {
</pre><pre style='margin:0'>
</pre>