Skip to content

Commit 6107f36

Browse files
javacruftjavacruft
committed
llvm: use versioned package names for internal package dependencies.
1 parent 295f7f3 commit 6107f36

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed

‎llvm-18.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ environment:
4141
- libffi-dev
4242
- libxml2-dev
4343
- pkgconf
44-
- python-3.13
44+
- python-${{vars.py-version}}
4545
- samurai
4646
- wolfi-base
4747
- zlib-dev
@@ -139,7 +139,7 @@ subpackages:
139139
provides:
140140
- libclang-cpp=${{package.full-version}}
141141
runtime:
142-
- libLLVM=${{package.full-version}}
142+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
143143
pipeline:
144144
- runs: |
145145
sonamefull="libclang-cpp.so.${{vars.major-minor-version}}"
@@ -179,9 +179,9 @@ subpackages:
179179
provides:
180180
- clang-analyzer=${{package.full-version}}
181181
runtime:
182-
- clang=${{package.full-version}}
182+
- clang-${{vars.major-version}}=${{package.full-version}}
183183
- perl
184-
- py3-clang=${{package.full-version}}
184+
- py3-clang-${{vars.major-version}}=${{package.full-version}}
185185
pipeline:
186186
- runs: |
187187
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -219,7 +219,7 @@ subpackages:
219219
provides:
220220
- clang-extras=${{package.full-version}}
221221
runtime:
222-
- clang=${{package.full-version}}
222+
- clang-${{vars.major-version}}=${{package.full-version}}
223223
pipeline:
224224
- runs: |
225225
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -317,8 +317,8 @@ subpackages:
317317
provides:
318318
- py3-clang=${{package.full-version}}
319319
runtime:
320-
- libLLVM=${{package.full-version}}
321-
- libclang-cpp=${{package.full-version}}
320+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
321+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
322322
- python-${{vars.py-version}}
323323
pipeline:
324324
- runs: |
@@ -347,9 +347,9 @@ subpackages:
347347
runtime:
348348
- gcc
349349
- glibc-dev
350-
- libLLVM=${{package.full-version}}
351-
- libclang-cpp=${{package.full-version}}
352-
- llvm=${{package.full-version}}
350+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
351+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
352+
- llvm-${{vars.major-version}}=${{package.full-version}}
353353
- openssf-compiler-options
354354
pipeline:
355355
- runs: |
@@ -477,8 +477,8 @@ subpackages:
477477
- lld-dev=${{package.full-version}}
478478
- llvm-lld-${{vars.major-version}}-dev=${{package.full-version}}
479479
runtime:
480-
- lld=${{package.full-version}}
481-
- lld-static=${{package.full-version}}
480+
- lld-${{vars.major-version}}=${{package.full-version}}
481+
- lld-${{vars.major-version}}-static=${{package.full-version}}
482482
pipeline:
483483
- runs: |
484484
mkdir -p ${{targets.contextdir}}/usr/include
@@ -507,7 +507,7 @@ subpackages:
507507
dependencies:
508508
provider-priority: ${{vars.major-version}}
509509
runtime:
510-
- libcxxabi1=${{package.full-version}}
510+
- libcxxabi1-${{vars.major-version}}=${{package.full-version}}
511511
provides:
512512
- libcxx1=${{package.full-version}}
513513
- llvm-libcxx-${{vars.major-version}}=${{package.full-version}}
@@ -537,8 +537,8 @@ subpackages:
537537
- libcxx1-dev=${{package.full-version}}
538538
- llvm-libcxx-${{vars.major-version}}-dev=${{package.full-version}}
539539
runtime:
540-
- libcxx1=${{package.full-version}}
541-
- libcxx1-static=${{package.full-version}}
540+
- libcxx1-${{vars.major-version}}=${{package.full-version}}
541+
- libcxx1-${{vars.major-version}}-static=${{package.full-version}}
542542
pipeline:
543543
- runs: |
544544
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -612,7 +612,7 @@ subpackages:
612612
provides:
613613
- llvm-dev=${{package.full-version}}
614614
runtime:
615-
- llvm=${{package.full-version}}
615+
- llvm-${{vars.major-version}}=${{package.full-version}}
616616
pipeline:
617617
- uses: split/dev
618618
- runs: |

‎llvm-19.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ environment:
4040
- libffi-dev
4141
- libxml2-dev
4242
- pkgconf
43-
- python-3.13
43+
- python-${{vars.py-version}}
4444
- samurai
4545
- wolfi-base
4646
- zlib-dev
@@ -138,7 +138,7 @@ subpackages:
138138
provides:
139139
- libclang-cpp=${{package.full-version}}
140140
runtime:
141-
- libLLVM=${{package.full-version}}
141+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
142142
pipeline:
143143
- runs: |
144144
sonamefull="libclang-cpp.so.${{vars.major-minor-version}}"
@@ -178,9 +178,9 @@ subpackages:
178178
provides:
179179
- clang-analyzer=${{package.full-version}}
180180
runtime:
181-
- clang=${{package.full-version}}
181+
- clang-${{vars.major-version}}=${{package.full-version}}
182182
- perl
183-
- py3-clang=${{package.full-version}}
183+
- py3-clang-${{vars.major-version}}=${{package.full-version}}
184184
pipeline:
185185
- runs: |
186186
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -218,7 +218,7 @@ subpackages:
218218
provides:
219219
- clang-extras=${{package.full-version}}
220220
runtime:
221-
- clang=${{package.full-version}}
221+
- clang-${{vars.major-version}}=${{package.full-version}}
222222
pipeline:
223223
- runs: |
224224
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -316,8 +316,8 @@ subpackages:
316316
provides:
317317
- py3-clang=${{package.full-version}}
318318
runtime:
319-
- libLLVM=${{package.full-version}}
320-
- libclang-cpp=${{package.full-version}}
319+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
320+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
321321
- python-${{vars.py-version}}
322322
pipeline:
323323
- runs: |
@@ -346,9 +346,9 @@ subpackages:
346346
runtime:
347347
- gcc
348348
- glibc-dev
349-
- libLLVM=${{package.full-version}}
350-
- libclang-cpp=${{package.full-version}}
351-
- llvm=${{package.full-version}}
349+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
350+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
351+
- llvm-${{vars.major-version}}=${{package.full-version}}
352352
- openssf-compiler-options
353353
pipeline:
354354
- runs: |
@@ -477,8 +477,8 @@ subpackages:
477477
- lld-dev=${{package.full-version}}
478478
- llvm-lld-${{vars.major-version}}-dev=${{package.full-version}}
479479
runtime:
480-
- lld=${{package.full-version}}
481-
- lld-static=${{package.full-version}}
480+
- lld-${{vars.major-version}}=${{package.full-version}}
481+
- lld-${{vars.major-version}}-static=${{package.full-version}}
482482
pipeline:
483483
- runs: |
484484
mkdir -p ${{targets.contextdir}}/usr/include
@@ -507,7 +507,7 @@ subpackages:
507507
dependencies:
508508
provider-priority: ${{vars.major-version}}
509509
runtime:
510-
- libcxxabi1=${{package.full-version}}
510+
- libcxxabi1-${{vars.major-version}}=${{package.full-version}}
511511
provides:
512512
- libcxx1=${{package.full-version}}
513513
- llvm-libcxx-${{vars.major-version}}=${{package.full-version}}
@@ -541,8 +541,8 @@ subpackages:
541541
- libcxx1-dev=${{package.full-version}}
542542
- llvm-libcxx-${{vars.major-version}}-dev=${{package.full-version}}
543543
runtime:
544-
- libcxx1=${{package.full-version}}
545-
- libcxx1-static=${{package.full-version}}
544+
- libcxx1-${{vars.major-version}}=${{package.full-version}}
545+
- libcxx1-${{vars.major-version}}-static=${{package.full-version}}
546546
pipeline:
547547
- runs: |
548548
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -561,7 +561,7 @@ subpackages:
561561
provider-priority: ${{vars.major-version}}
562562
provides:
563563
- llvm-libunwind=${{package.full-version}}
564-
- llvm-libunwind-19=${{package.full-version}}
564+
- llvm-libunwind-${{vars.major-version}}=${{package.full-version}}
565565
pipeline:
566566
- runs: |
567567
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -616,7 +616,7 @@ subpackages:
616616
provides:
617617
- llvm-dev=${{package.full-version}}
618618
runtime:
619-
- llvm=${{package.full-version}}
619+
- llvm-${{vars.major-version}}=${{package.full-version}}
620620
pipeline:
621621
- uses: split/dev
622622
- runs: |

‎llvm-20.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ environment:
4040
- libffi-dev
4141
- libxml2-dev
4242
- pkgconf
43-
- python-3.13
43+
- python-${{vars.py-version}}
4444
- samurai
4545
- wolfi-base
4646
- zlib-dev
@@ -138,7 +138,7 @@ subpackages:
138138
provides:
139139
- libclang-cpp=${{package.full-version}}
140140
runtime:
141-
- libLLVM=${{package.full-version}}
141+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
142142
pipeline:
143143
- runs: |
144144
sonamefull="libclang-cpp.so.${{vars.major-minor-version}}"
@@ -178,9 +178,9 @@ subpackages:
178178
provides:
179179
- clang-analyzer=${{package.full-version}}
180180
runtime:
181-
- clang=${{package.full-version}}
181+
- clang-${{vars.major-version}}=${{package.full-version}}
182182
- perl
183-
- py3-clang=${{package.full-version}}
183+
- py3-clang-${{vars.major-version}}=${{package.full-version}}
184184
pipeline:
185185
- runs: |
186186
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -218,7 +218,7 @@ subpackages:
218218
provides:
219219
- clang-extras=${{package.full-version}}
220220
runtime:
221-
- clang=${{package.full-version}}
221+
- clang-${{vars.major-version}}=${{package.full-version}}
222222
pipeline:
223223
- runs: |
224224
mkdir -p ${{targets.contextdir}}/${{vars.llvm-prefix}}/bin
@@ -313,8 +313,8 @@ subpackages:
313313
provides:
314314
- py3-clang=${{package.full-version}}
315315
runtime:
316-
- libLLVM=${{package.full-version}}
317-
- libclang-cpp=${{package.full-version}}
316+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
317+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
318318
- python-${{vars.py-version}}
319319
pipeline:
320320
- runs: |
@@ -340,9 +340,9 @@ subpackages:
340340
runtime:
341341
- gcc
342342
- glibc-dev
343-
- libLLVM=${{package.full-version}}
344-
- libclang-cpp=${{package.full-version}}
345-
- llvm=${{package.full-version}}
343+
- libLLVM-${{vars.major-version}}=${{package.full-version}}
344+
- libclang-cpp-${{vars.major-version}}=${{package.full-version}}
345+
- llvm-${{vars.major-version}}=${{package.full-version}}
346346
- openssf-compiler-options
347347
pipeline:
348348
- runs: |
@@ -469,8 +469,8 @@ subpackages:
469469
- lld-dev=${{package.full-version}}
470470
- llvm-lld-${{vars.major-version}}-dev=${{package.full-version}}
471471
runtime:
472-
- lld=${{package.full-version}}
473-
- lld-static=${{package.full-version}}
472+
- lld-${{vars.major-version}}=${{package.full-version}}
473+
- lld-${{vars.major-version}}-static=${{package.full-version}}
474474
pipeline:
475475
- runs: |
476476
mkdir -p ${{targets.contextdir}}/usr/include
@@ -499,7 +499,7 @@ subpackages:
499499
dependencies:
500500
provider-priority: ${{vars.major-version}}
501501
runtime:
502-
- libcxxabi1=${{package.full-version}}
502+
- libcxxabi1-${{vars.major-version}}=${{package.full-version}}
503503
provides:
504504
- libcxx1=${{package.full-version}}
505505
- llvm-libcxx-${{vars.major-version}}=${{package.full-version}}
@@ -533,8 +533,8 @@ subpackages:
533533
- libcxx1-dev=${{package.full-version}}
534534
- llvm-libcxx-${{vars.major-version}}-dev=${{package.full-version}}
535535
runtime:
536-
- libcxx1=${{package.full-version}}
537-
- libcxx1-static=${{package.full-version}}
536+
- libcxx1-${{vars.major-version}}=${{package.full-version}}
537+
- libcxx1-${{vars.major-version}}-static=${{package.full-version}}
538538
pipeline:
539539
- runs: |
540540
mkdir -p ${{targets.contextdir}}/usr/lib
@@ -608,7 +608,7 @@ subpackages:
608608
provides:
609609
- llvm-dev=${{package.full-version}}
610610
runtime:
611-
- llvm=${{package.full-version}}
611+
- llvm-${{vars.major-version}}=${{package.full-version}}
612612
pipeline:
613613
- uses: split/dev
614614
- runs: |

0 commit comments

Comments
 (0)