Merge pull request #235 from wolfi-dev/cleanup/llvm-15

LLVM 15.0.6, llvm-config cleanup
wolfi-dev · Dec 8, 2022 · 01ef3b9 · 01ef3b9
2 parents 8131e2a + 87c9eb3
commit 01ef3b9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 37 deletions.
diff --git a/Makefile b/Makefile
@@ -209,7 +209,7 @@ $(eval $(call build-package,postgresql-12,12.12-r0,postgresql))
 $(eval $(call build-package,postgresql-13,13.8-r0,postgresql))
 $(eval $(call build-package,postgresql-14,14.5-r0,postgresql))
 $(eval $(call build-package,postgresql-15,15.0-r0,postgresql))
-$(eval $(call build-package,llvm15,15.0.5-r1))
+$(eval $(call build-package,llvm15,15.0.6-r0))
 $(eval $(call build-package,tzdata,2022g-r0))
 $(eval $(call build-package,maven,3.8.6-r1))
 $(eval $(call build-package,tini,0.19.0-r0))
@@ -219,7 +219,7 @@ $(eval $(call build-package,mkfontscale,1.2.2-r0))
 $(eval $(call build-package,encodings,1.0.6-r0))
 $(eval $(call build-package,ttf-dejavu,2.37-r0))
 $(eval $(call build-package,bazel-5,5.3.2-r1))
-$(eval $(call build-package,clang-15,15.0.5-r0))
+$(eval $(call build-package,clang-15,15.0.6-r0))
 $(eval $(call build-package,giflib,5.2.1-r0))
 $(eval $(call build-package,jenkins,2.379-r0))
 $(eval $(call build-package,libjpeg,2.1.4-r0))
@@ -232,8 +232,8 @@ $(eval $(call build-package,kubectl,1.25.4-r1))
 $(eval $(call build-package,regclient,0.4.5-r1))
 $(eval $(call build-package,lcms,1.19-r0))
 $(eval $(call build-package,skopeo,1.10.0-r0))
-$(eval $(call build-package,llvm-libunwind,15.0.5-r0))
-$(eval $(call build-package,llvm-lld,15.0.5-r0))
+$(eval $(call build-package,llvm-libunwind,15.0.6-r0))
+$(eval $(call build-package,llvm-lld,15.0.6-r0))
 $(eval $(call build-package,mimalloc2,2.0.7-r0))
 $(eval $(call build-package,libtbb,2021.7.0-r0))
 $(eval $(call build-package,mold,1.7.1-r0))

diff --git a/clang-15.yaml b/clang-15.yaml
@@ -1,6 +1,6 @@
 package:
   name: clang-15
-  version: 15.0.5
+  version: 15.0.6
   epoch: 0
   description: "C language family frontend for LLVM"
   target-architecture:
@@ -36,16 +36,16 @@ pipeline:
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/clang-${{package.version}}.src.tar.xz
-      expected-sha256: 3737d1d81253bc7608443661ac616bdc06f8833d313f4c3e22ed0eecc55b1238
+      expected-sha256: 10119ae195f1b4f979fe42e67b781e175b0c0d4e982fd6a2f44c4aa7fc925233
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/clang-tools-extra-${{package.version}}.src.tar.xz
-      expected-sha256: 211399a64cd78105cf032a6c31d9cec9a4de5148439b577752bab5b353d44669
+      expected-sha256: 92b1714294efe13906d3b3f87d3273ea9eb38cb7f3b78631820086f0b0173b25
       strip-components: 0
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/cmake-${{package.version}}.src.tar.xz
-      expected-sha256: 61a9757f2fb7dd4c992522732531eb58b2bb031a2ca68848ff1cfda1fc07b7b3
+      expected-sha256: 7613aeeaba9b8b12b35224044bc349b5fa45525919625057fa54dc882dcb4c86
       strip-components: 0
   - runs: |
       mv cmake-${{package.version}}.src ../cmake
@@ -58,7 +58,7 @@ pipeline:
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCLANG_BUILT_STANDALONE=TRUE \
-        -DLLVM_CONFIG=/usr/bin/llvm-config \
+        -DLLVM_CONFIG=/usr/lib/llvm15/bin/llvm-config \
         -DCLANG_ENABLE_ARCMT=ON \
         -DCLANG_ENABLE_STATIC_ANALYZER=ON \
         -DCLANG_INCLUDE_TESTS=OFF \

diff --git a/llvm-libunwind.yaml b/llvm-libunwind.yaml
@@ -1,6 +1,6 @@
 package:
   name: llvm-libunwind
-  version: 15.0.5
+  version: 15.0.6
   epoch: 0
   description: LLVM version of libunwind library
   target-architecture:
@@ -20,16 +20,15 @@ environment:
       - llvm15-dev
       - cmake
       - samurai
-
 pipeline:
   - uses: fetch
     with:
-      expected-sha256: a1616b6114af17a50dd85139dc8d54c347cffc0ec998acc809c8be8d1edab0d3
+      expected-sha256: 020a5a0d5be26ad7a034878479f292718ad27295c843050a9be6116abc520a28
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/libunwind-${{package.version}}.src.tar.xz
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/cmake-${{package.version}}.src.tar.xz
-      expected-sha256: 61a9757f2fb7dd4c992522732531eb58b2bb031a2ca68848ff1cfda1fc07b7b3
+      expected-sha256: 7613aeeaba9b8b12b35224044bc349b5fa45525919625057fa54dc882dcb4c86
       strip-components: 0
   - runs: |
       mv cmake-${{package.version}}.src ../cmake
@@ -38,13 +37,12 @@ pipeline:
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCLANG_BUILT_STANDALONE=TRUE \
-        -DLLVM_CONFIG=/usr/bin/llvm-config \
+        -DLLVM_CONFIG=/usr/lib/llvm15/bin/llvm-config \
         -DLIBUNWIND_INSTALL_HEADERS=YES
   - runs: |
       cmake --build build
   - runs: |
       DESTDIR="${{targets.destdir}}" cmake --install build
-
 subpackages:
   - name: llvm-libunwind-static
     pipeline:

diff --git a/llvm-lld.yaml b/llvm-lld.yaml
@@ -1,6 +1,6 @@
 package:
   name: llvm-lld
-  version: 15.0.5
+  version: 15.0.6
   epoch: 0
   description: The LLVM Linker
   target-architecture:
@@ -28,19 +28,17 @@ environment:
       - git
       - llvm-libunwind-dev
       - curl
-
 pipeline:
   - uses: fetch
     with:
-      expected-sha256: 55241cb1ccc9cb3a8006373c58a8071990973ebfa67ed9b508a125492f4c005e
+      expected-sha256: 29fd83b61a1171c6bd51963ca54d0d7b577255e77fcd5ff03c0548fcc5b27b4f
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/lld-${{package.version}}.src.tar.xz
   - uses: fetch
     with:
-      expected-sha256: 61a9757f2fb7dd4c992522732531eb58b2bb031a2ca68848ff1cfda1fc07b7b3
+      expected-sha256: 7613aeeaba9b8b12b35224044bc349b5fa45525919625057fa54dc882dcb4c86
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/cmake-${{package.version}}.src.tar.xz
       strip-components: 0
-  - runs: |
-
+  - runs: |2
       cmake -B build -G Ninja -Wno-dev \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_MODULE_PATH="$PWD/cmake-${{package.version}}.src/Modules" \
@@ -49,15 +47,12 @@ pipeline:
         -DBUILD_SHARED_LIBS=ON \
         -DLLVM_INCLUDE_TESTS=OFF \
         -DLLD_BUILT_STANDALONE=ON \
-        -DLLVM_CONFIG=/usr/bin/llvm-config \
-        -DLLVM_INCLUDE_DIRS=/usr/include
-
+        -DLLVM_CONFIG=/usr/lib/llvm15/bin/llvm-config \
+        -DLLVM_INCLUDE_DIRS=/usr/lib/llvm15/include
   - runs: |
       cmake --build build
-
   - runs: |
       DESTDIR=${{targets.destdir}} cmake --install build
-
 subpackages:
   - name: llvm-lld-dev
     pipeline:

diff --git a/llvm15.yaml b/llvm15.yaml
@@ -1,7 +1,7 @@
 package:
   name: llvm15
-  version: 15.0.5
-  epoch: 1
+  version: 15.0.6
+  epoch: 0
   description: "low-level virtual machine - core frameworks"
   target-architecture:
     - all
@@ -29,11 +29,11 @@ pipeline:
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/llvm-${{package.version}}.src.tar.xz
-      expected-sha256: 4428688b567ab1c9911aa9e13cb44c9bc1b14431713c14de491e10369f2b0370
+      expected-sha256: 0b32199401f27e2e0353846a8c5fbadd77beca2570654fb9ef7ac9b7f26967e3
   - uses: fetch
     with:
       uri: https://github.com/llvm/llvm-project/releases/download/llvmorg-${{package.version}}/cmake-${{package.version}}.src.tar.xz
-      expected-sha256: 61a9757f2fb7dd4c992522732531eb58b2bb031a2ca68848ff1cfda1fc07b7b3
+      expected-sha256: 7613aeeaba9b8b12b35224044bc349b5fa45525919625057fa54dc882dcb4c86
       strip-components: 0
   - runs: |
       mv cmake-${{package.version}}.src ../cmake
@@ -81,10 +81,6 @@ pipeline:
   - runs: |
       cd "${{targets.destdir}}"/usr/lib/llvm15
 
-      mkdir -p "${{targets.destdir}}"/usr/include
-      mv include "${{targets.destdir}}"/usr/include/llvm15
-      ln -s ../../include/llvm15 include
-
       mkdir -p "${{targets.destdir}}"/usr/lib/
       for path in "${{targets.destdir}}"/usr/lib/llvm15/lib/*.a; do
         name=${path##*/}
@@ -129,9 +125,9 @@ subpackages:
     pipeline:
       - uses: split/dev
       - runs: |
-          mkdir -p "${{targets.subpkgdir}}"/usr/bin
-          mv "${{targets.destdir}}"/usr/lib/llvm15/bin/llvm-config "${{targets.subpkgdir}}"/usr/bin/llvm-config
-          
+          mkdir -p "${{targets.subpkgdir}}"/usr/lib/llvm15/bin
+          mv "${{targets.destdir}}"/usr/lib/llvm15/bin/llvm-config "${{targets.subpkgdir}}"/usr/lib/llvm15/bin/
+
           soname="libLLVM-15.so"
           sonamefull="libLLVM-${{package.version}}.so"