<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/3a6ed4b9a6482c3b17745c9bed4909fb1609838f">https://github.com/macports/macports-ports/commit/3a6ed4b9a6482c3b17745c9bed4909fb1609838f</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 3a6ed4b9a64 py-clang: 12.0.1; only carry three versions (#11610)
</span>3a6ed4b9a64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3a6ed4b9a6482c3b17745c9bed4909fb1609838f
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Fri Jul 16 09:45:43 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-clang: 12.0.1; only carry three versions (#11610)
</span>---
python/py-clang/Portfile | 59 ++++++++++++++----------------------------------
1 file changed, 17 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-clang/Portfile b/python/py-clang/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 272bc999007..9b201dbadf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-clang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-clang/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
# meta-version; bump whenever underlying variants are updated. Needed to
# support portindex (variants can't have different versions.)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6
</span> # Needed for change to meta-versioning
epoch 1
name py-clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,10 +21,10 @@ homepage \
</span>
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://github.com/llvm/llvm-project/tags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://api.github.com/repos/llvm/llvm-project/git/refs/tags
</span> # Update this to the most recent clang supported
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.version 11.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {releases\/tag\/llvmorg-([\d.]+)\"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version 12.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {llvmorg-([\d.]+)\"}
</span>
if {${name} ne ${subport}} {
# Share llvm's downloads
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,32 +35,18 @@ if {${name} ne ${subport}} {
</span> cfe-3.7.1.src.tar.xz \
rmd160 185b0f75970bc50682766a21794440578db87b5d \
sha256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cfe-5.0.2.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e4aa04b8aaa39d7c222d33b0e95b8d06c423d229 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fa9ce9724abdb68f166deea0af1f71ca0dfa9af8f7e1261f2cae63c280282800 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfe-6.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c280cd2037b19f9bd733944b765f9ca23b35e0a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7c243f1485bddfdfedada3cd402ff4792ea82362ff91fbdac2dae67c6026b667 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfe-7.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 914adafed7c97e5ebab15a437670906c404cb8bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a45b62dde5d7d5fdcdfa876b0af92f164d434b06e9e89b5d0b1cbc65dfe3f418 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfe-8.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8bec1ef0e0e49000886d8caed5ef42fb56a418b2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 70effd69f7a8ab249f66b0a68aba8b08af52aa2ab710dfb8a0fba102685b1646 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-9.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 424b98b3b6252f119fc06c8dfbc8fb1344531e88 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5778512b2e065c204010f88777d44b95250671103e434f9dc7363ab2e3804253 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-10.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 15b8a3b6c6f1a2896146006b30fbcf104be7c2b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24 \
</span> clang-11.1.0.src.tar.xz \
rmd160 6da46dc07e6ce8bf33c6342812e3c89498bb2b27 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0a8288f065d1f57cb6d96da4d2965cbea32edc572aa972e466e954d17148558b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang-12.0.1.src.tar.xz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 662d890fe81218fbf79c25540eb09c7664bc5b8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6e912133bcf56e9cfe6a346fa7e5c52c2cde3e4e48b7a6cc6fcc7c75047da45f
</span>
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set clanglist {37 50 60 70 80 90 10 11}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clangvlist {3.7.1 5.0.2 6.0.1 7.0.1 8.0.1 9.0.1 10.0.1 11.1.0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Keeping 37 around for old systems; otherwise two latest releases.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clanglist {37 11 12}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clangvlist {3.7.1 11.1.0 12.0.1}
</span>
foreach cvnum $clanglist {
# Explictly use (and depend on) the libclang we select during install
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,9 +80,8 @@ if {${name} ne ${subport}} {
</span> reinplace {s/version=.*/version=\"${clang_version}\",/} setup.py
}
livecheck.version ${clang_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Yes, I didn't bother escaping the '.'s
</span> livecheck.regex \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- \" ([string range $clang_version 0 2].\\\[0-9\\\]+): \"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"llvmorg-([string range $clang_version 0 1]\\\\.\\\[0-9.\\\]+)\\\"\"
</span> "
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,27 +90,17 @@ if {${name} ne ${subport}} {
</span> test.target -m unittest discover -v
if {![variant_isset clang37] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang50] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang60] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang70] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang80] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang90] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang10] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +clang11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang11] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang12]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +clang12
</span> }
pre-extract {
# Will never hit this when installing from packages, which is OK, as
# they will have the default variant set above.
if {![variant_isset clang37] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang50] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang60] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang70] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang80] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang90] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang10] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset clang11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang11] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset clang12]} {
</span> ui_error "At least one of the clangNN variants must be active."
return -code error "Unsupported (no) variants selected."
}
</pre><pre style='margin:0'>
</pre>