Skip to content

Commit dd90446

Browse files
committed
llvm fixes
1 parent f1f5814 commit dd90446

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

llvm.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ package:
1515
- ${{package.name}}-${{vars.major-version}}=${{package.full-version}}
1616

1717
vars:
18-
llvm-prefix: "/usr/lib/llvm-19"
19-
clang-prefix: "/usr/lib/llvm-19/lib/clang/19"
18+
llvm-prefix: "/usr/lib/llvm-20"
19+
clang-prefix: "/usr/lib/llvm-20/lib/clang/20"
2020
py-version: 3.13
2121

2222
var-transforms:
@@ -234,7 +234,6 @@ subpackages:
234234
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-offload-packager* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
235235
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-query* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
236236
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-refactor* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
237-
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-rename* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
238237
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-reorder-fields* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
239238
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-repl* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
240239
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/bin/clang-scan-deps* ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin/
@@ -291,8 +290,6 @@ subpackages:
291290
clang-query --help
292291
clang-refactor --version
293292
clang-refactor --help
294-
clang-rename --version
295-
clang-rename --help
296293
clang-reorder-fields --version
297294
clang-reorder-fields --help
298295
clang-repl --version
@@ -327,7 +324,6 @@ subpackages:
327324
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/lib/python* ${{targets.contextdir}}/${{vars.llvm-prefix}}/lib/
328325
329326
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/share/clang
330-
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/share/clang/clang-rename.py ${{targets.contextdir}}/${{vars.llvm-prefix}}/share/clang/
331327
332328
mkdir -p ${{targets.contextdir}}/"$sitedir"
333329
mv ${{targets.destdir}}/${{vars.llvm-prefix}}/lib/libscanbuild ${{targets.contextdir}}/"$sitedir"
@@ -445,6 +441,7 @@ subpackages:
445441
- llvm-lld-17=${{package.full-version}}
446442
- llvm-lld-18=${{package.full-version}}
447443
- llvm-lld-19=${{package.full-version}}
444+
- llvm-lld-20=${{package.full-version}}
448445
pipeline:
449446
- runs: |
450447
mkdir -p ${{targets.contextdir}}/usr/bin
@@ -471,6 +468,7 @@ subpackages:
471468
- llvm-lld-17-static=${{package.full-version}}
472469
- llvm-lld-18-static=${{package.full-version}}
473470
- llvm-lld-19-static=${{package.full-version}}
471+
- llvm-lld-20-static=${{package.full-version}}
474472
pipeline:
475473
- runs: |
476474
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -485,6 +483,7 @@ subpackages:
485483
- llvm-lld-17-dev=${{package.full-version}}
486484
- llvm-lld-18-dev=${{package.full-version}}
487485
- llvm-lld-19-dev=${{package.full-version}}
486+
- llvm-lld-20-dev=${{package.full-version}}
488487
runtime:
489488
- lld=${{package.full-version}}
490489
- lld-static=${{package.full-version}}
@@ -503,6 +502,7 @@ subpackages:
503502
provides:
504503
- llvm-libcxxabi-18=${{package.full-version}}
505504
- llvm-libcxxabi-19=${{package.full-version}}
505+
- llvm-libcxxabi-20=${{package.full-version}}
506506
pipeline:
507507
- runs: |
508508
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -518,6 +518,7 @@ subpackages:
518518
provides:
519519
- llvm-libcxx-18=${{package.full-version}}
520520
- llvm-libcxx-19=${{package.full-version}}
521+
- llvm-libcxx-20=${{package.full-version}}
521522
pipeline:
522523
- runs: |
523524
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -536,6 +537,7 @@ subpackages:
536537
provides:
537538
- llvm-libcxx-18-static=${{package.full-version}}
538539
- llvm-libcxx-19-static=${{package.full-version}}
540+
- llvm-libcxx-20-static=${{package.full-version}}
539541
pipeline:
540542
- runs: |
541543
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -547,6 +549,7 @@ subpackages:
547549
provides:
548550
- llvm-libcxx-18-dev=${{package.full-version}}
549551
- llvm-libcxx-19-dev=${{package.full-version}}
552+
- llvm-libcxx-20-dev=${{package.full-version}}
550553
runtime:
551554
- libcxx1=${{package.full-version}}
552555
- libcxx1-static=${{package.full-version}}
@@ -572,6 +575,7 @@ subpackages:
572575
- ${{package.name}}-libunwind-17=${{package.full-version}}
573576
- ${{package.name}}-libunwind-18=${{package.full-version}}
574577
- ${{package.name}}-libunwind-19=${{package.full-version}}
578+
- ${{package.name}}-libunwind-20=${{package.full-version}}
575579
pipeline:
576580
- runs: |
577581
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -589,6 +593,7 @@ subpackages:
589593
- ${{package.name}}-libunwind-17-static=${{package.full-version}}
590594
- ${{package.name}}-libunwind-18-static=${{package.full-version}}
591595
- ${{package.name}}-libunwind-19-static=${{package.full-version}}
596+
- ${{package.name}}-libunwind-20-static=${{package.full-version}}
592597
pipeline:
593598
- runs: |
594599
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -603,6 +608,7 @@ subpackages:
603608
- ${{package.name}}-libunwind-17-dev=${{package.full-version}}
604609
- ${{package.name}}-libunwind-18-dev=${{package.full-version}}
605610
- ${{package.name}}-libunwind-19-dev=${{package.full-version}}
611+
- ${{package.name}}-libunwind-20-dev=${{package.full-version}}
606612
runtime:
607613
- ${{package.name}}-libunwind1=${{package.full-version}}
608614
- ${{package.name}}-libunwind1-static=${{package.full-version}}

0 commit comments

Comments
 (0)