<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d80096db2db4144c4cf880d1a8a2d671baacd4ff">https://github.com/macports/macports-ports/commit/d80096db2db4144c4cf880d1a8a2d671baacd4ff</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d80096db2db4144c4cf880d1a8a2d671baacd4ff
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Aug 23 13:55:39 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> ccls: update to 20220729; add clang 12 thru 14
</span><span style='display:block; white-space:pre;color:#404040;'> - Use rapidjson, rather than building private version
</span><span style='display:block; white-space:pre;color:#404040;'> - Install ccls-clang-10 by default, for parent port
</span><span style='display:block; white-space:pre;color:#404040;'> - Add port-select functionality
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59811
</span>---
devel/ccls/Portfile | 50 +++++++++++++++++++++++--------
devel/ccls/files/portselect/base | 1 +
devel/ccls/files/portselect/ccls-clang-10 | 1 +
devel/ccls/files/portselect/ccls-clang-11 | 1 +
devel/ccls/files/portselect/ccls-clang-12 | 1 +
devel/ccls/files/portselect/ccls-clang-13 | 1 +
devel/ccls/files/portselect/ccls-clang-14 | 1 +
devel/ccls/files/portselect/none | 1 +
8 files changed, 45 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/Portfile b/devel/ccls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 10d1ff0afa2..cc497e7f8dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ccls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
name ccls
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup MaskRay ccls 0.20201025
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup MaskRay ccls 0.20220729
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,21 +15,44 @@ description C/C++/ObjC language server supporting cross referenc
</span> hierarchies, completion and semantic highlighting
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6940c3c327249028f531407328211b7169417996 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 51a96f8f82d0a370acb2c5e2d9fdd4ed7ba4d49fc9d3cf6ece9b169ad59d3ab6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 160860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ccls_default ccls-clang-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set select_path ${filespath}/portselect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ccls_select {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup stub 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select::install ${name} ${select_path}/base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select::install ${name} ${select_path}/none
</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;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach clang_v {7.0 8.0 9.0} {
subport ccls-clang-${clang_v} {
PortGroup obsolete 1.0
# Obsolete Date: 2022-08-15
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ccls-clang-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${ccls_default}
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach clang_v {10 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach clang_v {10 11 12 13 14} {
</span> subport ccls-clang-${clang_v} {
PortGroup cmake 1.1
PortGroup legacysupport 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.group ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.file ${select_path}/${subport}
</span>
legacysupport.newest_darwin_requires_legacy \
15
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,18 +63,19 @@ foreach clang_v {10 11} {
</span> compiler.cxx_standard 2017
cmake.set_cxx_standard yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Reduce compilation warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-deprecated-declarations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.module_path-append \
${prefix}/libexec/llvm-${clang_v}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:clang-${clang_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_RAPIDJSON=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCCLS_VERSION="${version}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fetch from git instead of distfile because it needs submodules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fetch.type git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W "${worksrcpath}" "git submodule update --init --recursive"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:clang-${clang_v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rapidjson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:ccls_select
</span>
post-destroot {
# Avoid conflicts between different clang builds
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,4 +89,6 @@ if {${subport} eq ${name}} {
</span>
supported_archs noarch
description "${description} (meta port)"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${ccls_default}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/base b/devel/ccls/files/portselect/base
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5c9e948a187
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/base
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/ccls-clang-10 b/devel/ccls/files/portselect/ccls-clang-10
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..340035aa674
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/ccls-clang-10
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls-clang-10
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/ccls-clang-11 b/devel/ccls/files/portselect/ccls-clang-11
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..84338571fe6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/ccls-clang-11
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls-clang-11
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/ccls-clang-12 b/devel/ccls/files/portselect/ccls-clang-12
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..25bdcbd601a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/ccls-clang-12
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls-clang-12
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/ccls-clang-13 b/devel/ccls/files/portselect/ccls-clang-13
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b3cd812f85c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/ccls-clang-13
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls-clang-13
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/ccls-clang-14 b/devel/ccls/files/portselect/ccls-clang-14
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ddc2d0329d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/ccls-clang-14
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/ccls-clang-14
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ccls/files/portselect/none b/devel/ccls/files/portselect/none
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..39cdd0ded6d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ccls/files/portselect/none
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span></pre><pre style='margin:0'>
</pre>