Skip to content

Commit 3137057

Browse files
committed
llvm-14: move select files to subports, add entries
See: macports#28744
1 parent b7df1bc commit 3137057

File tree

7 files changed

+14
-23
lines changed

7 files changed

+14
-23
lines changed

lang/llvm-14/Portfile

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
22

33
PortSystem 1.0
4-
PortGroup select 1.0
54
PortGroup active_variants 1.1
65
PortGroup cmake 1.1
76
PortGroup legacysupport 1.1
@@ -24,10 +23,10 @@ set clang_exe_version ${llvm_version}
2423
version ${llvm_version}.0.6
2524

2625
name llvm-${llvm_version}
27-
revision 0
26+
revision 1
2827
subport mlir-${llvm_version} { revision 0 }
29-
subport clang-${llvm_version} { revision 3 }
30-
subport lldb-${llvm_version} { revision 2 }
28+
subport clang-${llvm_version} { revision 4 }
29+
subport lldb-${llvm_version} { revision 3 }
3130
subport flang-${llvm_version} { revision 1 }
3231

3332
checksums rmd160 2b8b71bbb9fa5718c85f78924a0aa7e700cbd2ee \
@@ -197,10 +196,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
197196
the LLVM intermediate representation ("LLVM IR").
198197

199198
depends_lib-append port:libedit port:libffi port:ncurses path:lib/libxar.dylib:xar port:zlib
200-
depends_run-append port:llvm_select
201-
202-
select.group llvm
203-
select.file ${filespath}/mp-${subport}
199+
depends_run-append port:llvm_select-${llvm_version}
204200

205201
configure.args-append \
206202
-DLLVM_ENABLE_PROJECTS="polly"
@@ -239,9 +235,7 @@ if { ${subport} eq "clang-${llvm_version}" } {
239235
for languages in the C language family (C, C++, Objective C/C++, OpenCL, \
240236
CUDA, and RenderScript) for the LLVM project.
241237

242-
depends_run-append port:clang_select port:cctools
243-
select.group clang
244-
select.file ${filespath}/mp-${subport}
238+
depends_run-append port:clang_select-${llvm_version} port:cctools
245239

246240
configure.args-append \
247241
-DLLVM_ENABLE_PROJECTS="clang\;clang-tools-extra\;compiler-rt\;libcxx\;libcxxabi\;lld" \
@@ -373,10 +367,7 @@ if {${subport} eq "lldb-${llvm_version}"} {
373367
depends_lib-append port:libedit port:libffi port:ncurses port:python${py_ver_nodot} path:lib/libxar.dylib:xar port:zlib
374368
depends_lib-append port:llvm-${llvm_version} port:clang-${llvm_version}
375369
depends_build-append port:swig-python path:bin/doxygen:doxygen
376-
depends_run-append port:lldb_select
377-
378-
select.group lldb
379-
select.file ${filespath}/mp-${subport}
370+
depends_run-append port:lldb_select-${llvm_version}
380371

381372
# error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E
382373
platforms {darwin >= 18}

sysutils/clang_select/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if {$subport eq $name} {
2828
{clang none}
2929
}
3030

31-
foreach v {15 16 17 18 19 20 21} {
31+
foreach v {14 15 16 17 18 19 20 21} {
3232
subport clang_select-${v} {
3333
set clangver $v
3434
}

lang/llvm-14/files/mp-clang-14 renamed to sysutils/clang_select/files/mp-clang-14

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ bin/clang-cl-mp-14
1212
bin/clang-query-mp-14
1313
bin/clang-rename-mp-14
1414
bin/clang-tidy-mp-14
15+
bin/git-clang-format-mp-14
16+
bin/run-clang-tidy-mp-14
1517
-
18+
bin/clangd-mp-14
19+
libexec/llvm-14/share/clang/clang-format-diff.py
20+
libexec/llvm-14/share/clang/clang-tidy-diff.py
1621
-
1722
-
1823
-
@@ -27,8 +32,3 @@ bin/clang-tidy-mp-14
2732
-
2833
-
2934
-
30-
-
31-
-
32-
-
33-
-
34-

sysutils/lldb_select/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if {$subport eq $name} {
2828
{lldb none}
2929
}
3030

31-
foreach v {15 16 17 18 19 20 21} {
31+
foreach v {14 15 16 17 18 19 20 21} {
3232
subport lldb_select-${v} {
3333
set lldbver $v
3434
}
File renamed without changes.

sysutils/llvm_select/Portfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if {$subport eq $name} {
2828
{llvm none}
2929
}
3030

31-
foreach v {15 16 17 18 19 20 21} {
31+
foreach v {14 15 16 17 18 19 20 21} {
3232
subport llvm_select-${v} {
3333
set llvmver $v
3434
}
File renamed without changes.

0 commit comments

Comments
 (0)