Skip to content

Commit 34f765e

Browse files
javacruftjavacruft
committed
llvm-{18,19}: drop provides
Drop unversioned streamed provides; this allows co-installability between LLVM versions, with just the most recent providing versionless provides packages.
1 parent 6107f36 commit 34f765e

File tree

2 files changed

+0
-60
lines changed

2 files changed

+0
-60
lines changed

‎llvm-18.yaml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ package:
88
resources:
99
cpu: 32
1010
memory: 64Gi
11-
dependencies:
12-
provides:
13-
- llvm=${{package.full-version}}
1411

1512
vars:
1613
llvm-prefix: "/usr/lib/llvm-18"
@@ -117,9 +114,6 @@ pipeline:
117114
subpackages:
118115
- name: libLLVM-${{vars.major-version}}
119116
description: LLVM ${{vars.major-version}} runtime library
120-
dependencies:
121-
provides:
122-
- libLLVM=${{package.full-version}}
123117
pipeline:
124118
- runs: |
125119
soname="libLLVM.so.${{vars.major-minor-version}}"
@@ -136,8 +130,6 @@ subpackages:
136130
- name: libclang-cpp-${{vars.major-version}}
137131
description: Clang ${{vars.major-version}} runtime library
138132
dependencies:
139-
provides:
140-
- libclang-cpp=${{package.full-version}}
141133
runtime:
142134
- libLLVM-${{vars.major-version}}=${{package.full-version}}
143135
pipeline:
@@ -176,8 +168,6 @@ subpackages:
176168
- name: clang-${{vars.major-version}}-analyzer
177169
description: Clang ${{vars.major-version}} analyzer
178170
dependencies:
179-
provides:
180-
- clang-analyzer=${{package.full-version}}
181171
runtime:
182172
- clang-${{vars.major-version}}=${{package.full-version}}
183173
- perl
@@ -216,8 +206,6 @@ subpackages:
216206
- name: clang-${{vars.major-version}}-extras
217207
description: Clang ${{vars.major-version}} extras
218208
dependencies:
219-
provides:
220-
- clang-extras=${{package.full-version}}
221209
runtime:
222210
- clang-${{vars.major-version}}=${{package.full-version}}
223211
pipeline:
@@ -314,8 +302,6 @@ subpackages:
314302
- name: py3-clang-${{vars.major-version}}
315303
description: Clang ${{vars.major-version}} Python bindings
316304
dependencies:
317-
provides:
318-
- py3-clang=${{package.full-version}}
319305
runtime:
320306
- libLLVM-${{vars.major-version}}=${{package.full-version}}
321307
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
@@ -342,8 +328,6 @@ subpackages:
342328
- name: clang-${{vars.major-version}}
343329
description: C language family frontend for LLVM ${{vars.major-version}}
344330
dependencies:
345-
provides:
346-
- clang=${{package.full-version}}
347331
runtime:
348332
- gcc
349333
- glibc-dev
@@ -440,7 +424,6 @@ subpackages:
440424
description: LLVM linker
441425
dependencies:
442426
provides:
443-
- lld=${{package.full-version}}
444427
- llvm-lld-${{vars.major-version}}=${{package.full-version}}
445428
pipeline:
446429
- runs: |
@@ -463,7 +446,6 @@ subpackages:
463446
description: LLVM linker static libraries
464447
dependencies:
465448
provides:
466-
- lld-static=${{package.full-version}}
467449
- llvm-lld-${{vars.major-version}}-static=${{package.full-version}}
468450
pipeline:
469451
- runs: |
@@ -474,7 +456,6 @@ subpackages:
474456
description: LLVM linker development files
475457
dependencies:
476458
provides:
477-
- lld-dev=${{package.full-version}}
478459
- llvm-lld-${{vars.major-version}}-dev=${{package.full-version}}
479460
runtime:
480461
- lld-${{vars.major-version}}=${{package.full-version}}
@@ -492,7 +473,6 @@ subpackages:
492473
dependencies:
493474
provider-priority: ${{vars.major-version}}
494475
provides:
495-
- libcxxabi1=${{package.full-version}}
496476
- llvm-libcxxabi-${{vars.major-version}}=${{package.full-version}}
497477
pipeline:
498478
- runs: |
@@ -509,7 +489,6 @@ subpackages:
509489
runtime:
510490
- libcxxabi1-${{vars.major-version}}=${{package.full-version}}
511491
provides:
512-
- libcxx1=${{package.full-version}}
513492
- llvm-libcxx-${{vars.major-version}}=${{package.full-version}}
514493
pipeline:
515494
- runs: |
@@ -523,7 +502,6 @@ subpackages:
523502
description: Static library for LLVM libc++ 1
524503
dependencies:
525504
provides:
526-
- libcxx1-static=${{package.full-version}}
527505
- llvm-libcxx-${{vars.major-version}}-static=${{package.full-version}}
528506
pipeline:
529507
- runs: |
@@ -534,7 +512,6 @@ subpackages:
534512
description: Development files for LLVM libc++ 1
535513
dependencies:
536514
provides:
537-
- libcxx1-dev=${{package.full-version}}
538515
- llvm-libcxx-${{vars.major-version}}-dev=${{package.full-version}}
539516
runtime:
540517
- libcxx1-${{vars.major-version}}=${{package.full-version}}
@@ -556,7 +533,6 @@ subpackages:
556533
dependencies:
557534
provider-priority: ${{vars.major-version}}
558535
provides:
559-
- llvm-libunwind=${{package.full-version}}
560536
- llvm-libunwind-${{vars.major-version}}=${{package.full-version}}
561537
pipeline:
562538
- runs: |
@@ -570,7 +546,6 @@ subpackages:
570546
description: Static library for LLVM libunwind 1
571547
dependencies:
572548
provides:
573-
- llvm-libunwind-static=${{package.full-version}}
574549
- llvm-libunwind-${{vars.major-version}}-static=${{package.full-version}}
575550
pipeline:
576551
- runs: |
@@ -581,7 +556,6 @@ subpackages:
581556
description: Development files for LLVM libunwind 1
582557
dependencies:
583558
provides:
584-
- llvm-libunwind-dev=${{package.full-version}}
585559
- llvm-libunwind-${{vars.major-version}}-dev=${{package.full-version}}
586560
runtime:
587561
- llvm-libunwind1-${{vars.major-version}}=${{package.full-version}}
@@ -597,8 +571,6 @@ subpackages:
597571
- name: llvm-cmake-${{vars.major-version}}
598572
description: CMake macros for LLVM ${{vars.major-version}}
599573
dependencies:
600-
provides:
601-
- llvm-cmake=${{package.full-version}}
602574
runtime:
603575
- cmake
604576
pipeline:
@@ -609,8 +581,6 @@ subpackages:
609581
- name: ${{package.name}}-dev
610582
description: Development headers for LLVM ${{vars.major-version}}
611583
dependencies:
612-
provides:
613-
- llvm-dev=${{package.full-version}}
614584
runtime:
615585
- llvm-${{vars.major-version}}=${{package.full-version}}
616586
pipeline:

‎llvm-19.yaml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ package:
88
resources:
99
cpu: 32
1010
memory: 64Gi
11-
dependencies:
12-
provides:
13-
- llvm=${{package.full-version}}
1411

1512
vars:
1613
llvm-prefix: "/usr/lib/llvm-19"
@@ -116,9 +113,6 @@ pipeline:
116113
subpackages:
117114
- name: libLLVM-${{vars.major-version}}
118115
description: LLVM ${{vars.major-version}} runtime library
119-
dependencies:
120-
provides:
121-
- libLLVM=${{package.full-version}}
122116
pipeline:
123117
- runs: |
124118
soname="libLLVM.so.${{vars.major-minor-version}}"
@@ -135,8 +129,6 @@ subpackages:
135129
- name: libclang-cpp-${{vars.major-version}}
136130
description: Clang ${{vars.major-version}} runtime library
137131
dependencies:
138-
provides:
139-
- libclang-cpp=${{package.full-version}}
140132
runtime:
141133
- libLLVM-${{vars.major-version}}=${{package.full-version}}
142134
pipeline:
@@ -175,8 +167,6 @@ subpackages:
175167
- name: clang-${{vars.major-version}}-analyzer
176168
description: Clang ${{vars.major-version}} analyzer
177169
dependencies:
178-
provides:
179-
- clang-analyzer=${{package.full-version}}
180170
runtime:
181171
- clang-${{vars.major-version}}=${{package.full-version}}
182172
- perl
@@ -215,8 +205,6 @@ subpackages:
215205
- name: clang-${{vars.major-version}}-extras
216206
description: Clang ${{vars.major-version}} extras
217207
dependencies:
218-
provides:
219-
- clang-extras=${{package.full-version}}
220208
runtime:
221209
- clang-${{vars.major-version}}=${{package.full-version}}
222210
pipeline:
@@ -313,8 +301,6 @@ subpackages:
313301
- name: py3-clang-${{vars.major-version}}
314302
description: Clang ${{vars.major-version}} Python bindings
315303
dependencies:
316-
provides:
317-
- py3-clang=${{package.full-version}}
318304
runtime:
319305
- libLLVM-${{vars.major-version}}=${{package.full-version}}
320306
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
@@ -341,8 +327,6 @@ subpackages:
341327
- name: clang-${{vars.major-version}}
342328
description: C language family frontend for LLVM ${{vars.major-version}}
343329
dependencies:
344-
provides:
345-
- clang=${{package.full-version}}
346330
runtime:
347331
- gcc
348332
- glibc-dev
@@ -440,7 +424,6 @@ subpackages:
440424
description: LLVM linker
441425
dependencies:
442426
provides:
443-
- lld=${{package.full-version}}
444427
- llvm-lld-${{vars.major-version}}=${{package.full-version}}
445428
pipeline:
446429
- runs: |
@@ -463,7 +446,6 @@ subpackages:
463446
description: LLVM linker static libraries
464447
dependencies:
465448
provides:
466-
- lld-static=${{package.full-version}}
467449
- llvm-lld-${{vars.major-version}}-static=${{package.full-version}}
468450
pipeline:
469451
- runs: |
@@ -474,7 +456,6 @@ subpackages:
474456
description: LLVM linker development files
475457
dependencies:
476458
provides:
477-
- lld-dev=${{package.full-version}}
478459
- llvm-lld-${{vars.major-version}}-dev=${{package.full-version}}
479460
runtime:
480461
- lld-${{vars.major-version}}=${{package.full-version}}
@@ -492,7 +473,6 @@ subpackages:
492473
dependencies:
493474
provider-priority: ${{vars.major-version}}
494475
provides:
495-
- libcxxabi1=${{package.full-version}}
496476
- llvm-libcxxabi-${{vars.major-version}}=${{package.full-version}}
497477
pipeline:
498478
- runs: |
@@ -509,7 +489,6 @@ subpackages:
509489
runtime:
510490
- libcxxabi1-${{vars.major-version}}=${{package.full-version}}
511491
provides:
512-
- libcxx1=${{package.full-version}}
513492
- llvm-libcxx-${{vars.major-version}}=${{package.full-version}}
514493
pipeline:
515494
- runs: |
@@ -527,7 +506,6 @@ subpackages:
527506
description: Static library for LLVM libc++ 1
528507
dependencies:
529508
provides:
530-
- libcxx1-static=${{package.full-version}}
531509
- llvm-libcxx-${{vars.major-version}}-static=${{package.full-version}}
532510
pipeline:
533511
- runs: |
@@ -538,7 +516,6 @@ subpackages:
538516
description: Development files for LLVM libc++ 1
539517
dependencies:
540518
provides:
541-
- libcxx1-dev=${{package.full-version}}
542519
- llvm-libcxx-${{vars.major-version}}-dev=${{package.full-version}}
543520
runtime:
544521
- libcxx1-${{vars.major-version}}=${{package.full-version}}
@@ -560,7 +537,6 @@ subpackages:
560537
dependencies:
561538
provider-priority: ${{vars.major-version}}
562539
provides:
563-
- llvm-libunwind=${{package.full-version}}
564540
- llvm-libunwind-${{vars.major-version}}=${{package.full-version}}
565541
pipeline:
566542
- runs: |
@@ -574,7 +550,6 @@ subpackages:
574550
description: Static library for LLVM libunwind 1
575551
dependencies:
576552
provides:
577-
- llvm-libunwind-static=${{package.full-version}}
578553
- llvm-libunwind-${{vars.major-version}}-static=${{package.full-version}}
579554
pipeline:
580555
- runs: |
@@ -585,7 +560,6 @@ subpackages:
585560
description: Development files for LLVM libunwind 1
586561
dependencies:
587562
provides:
588-
- llvm-libunwind-dev=${{package.full-version}}
589563
- llvm-libunwind-${{vars.major-version}}-dev=${{package.full-version}}
590564
runtime:
591565
- llvm-libunwind1-${{vars.major-version}}=${{package.full-version}}
@@ -601,8 +575,6 @@ subpackages:
601575
- name: llvm-cmake-${{vars.major-version}}
602576
description: CMake macros for LLVM ${{vars.major-version}}
603577
dependencies:
604-
provides:
605-
- llvm-cmake=${{package.full-version}}
606578
runtime:
607579
- cmake
608580
pipeline:
@@ -613,8 +585,6 @@ subpackages:
613585
- name: ${{package.name}}-dev
614586
description: Development headers for LLVM ${{vars.major-version}}
615587
dependencies:
616-
provides:
617-
- llvm-dev=${{package.full-version}}
618588
runtime:
619589
- llvm-${{vars.major-version}}=${{package.full-version}}
620590
pipeline:

0 commit comments

Comments
 (0)