F44

container.yaml

@@ -1,62 +1,60 @@
 flatpak:
     id: org.fedoraproject.Sdk.Extension.llvm20
-    branch: f42
+    branch: f44
     build-extension: true
     runtime: org.fedoraproject.Sdk
-    runtime-version: f42
+    runtime-version: f44
     sdk: org.fedoraproject.Sdk
-    name: f42/llvm20
+    name: f44/llvm20
     component: llvm20-flatpak
     packages:
-    - clang
-    - clang-analyzer
-    - clang-devel
-    - clang-libs
-    - clang-tools-extra
-    - clang-tools-extra-devel
-    - compiler-rt
-    - git-clang-format
+    - clang20
+    - clang20-analyzer
+    - clang20-devel
+    - clang20-libs
+    - clang20-tools-extra
+    - clang20-tools-extra-devel
+    - compiler-rt20
+    - git-clang-format20
     - libcxx
     - libcxx-devel
     - libcxxabi
     - libcxxabi-devel
-    - libomp
-    - libomp-devel
-    - lld
-    - lld-devel
-    - lld-libs
-    - lldb
-    - lldb-devel
-    - llvm
-    - name: llvm-bolt
-      platforms:
-          only: [aarch64, x86_64]
-    - llvm-cmake-utils
-    - llvm-devel
-    - llvm-googletest
-    - llvm-libs
+    - libomp20
+    - libomp20-devel
+    - lld20
+    - lld20-devel
+    - lld20-libs
+    - lldb20
+    - lldb20-devel
+    - llvm20
+    - llvm20-cmake-utils
+    - llvm20-devel
+    - llvm20-googletest
+    - llvm20-libs
     - llvm-libunwind
     - llvm-libunwind-devel
-    - llvm-test
-    - mlir
-    - mlir-devel
-    - polly
-    - polly-devel
+    - llvm20-test
     - python3-clang
     - python3-lit
     - python3-lldb
-    - python3-mlir
     - llvm20-flatpak-config
     # for cleanup-commands (part of runtime)
     - coreutils-single
     - rpm
     - sed
     cleanup-commands: |
-        for f in `rpm -aql clang* compiler-rt git-clang-format libcxx* libomp* lld* llvm* polly* python3-{clang,lit,lldb,mlir}`; do \
+        mkdir -p /app/{bin,include,lib64,libexec,share}
+        for f in `rpm -aql clang20* compiler-rt20 git-clang-format20 libcxx* libomp20* lld20* lldb20* llvm20* llvm-libunwind* python3-{clang,lit,lldb}`; do \
              case $f in /usr/lib/.build-id*|/app/*) continue ;; esac ; \
-             if [ ! -d $f ]; then d=$(echo $f | sed -e 's|^/usr/\(.*\)/[^/]*$|/app/\1|;s|^\(/etc/.*\)/[^/]*|/app/\1|'); mkdir -p ${d/\/lib64/\/lib}; cp -a $f ${d/\/lib64/\/lib}; fi; \
+             if [ ! -d $f ]; then d=$(echo $f | sed -e 's|^/usr/\(.*\)/[^/]*$|/app/\1|;s|^\(/etc/.*\)/[^/]*|/app/\1|'); mkdir -p $d; mv $f $d; fi; \
         done
-        ln -sfn ../lib/llvm20/bin/llvm-config /app/bin/llvm-config-20
-        ln -sfn llvm-config-20 /app/bin/llvm-config
+        mv /app/lib64/llvm20/bin/* /app/bin/
+        mv /app/lib64/llvm20/include/* /app/include/
+        mv /app/lib64/llvm20/lib64/* /app/lib64/
+        mv /app/lib64/llvm20/libexec/* /app/libexec/
+        mv /app/lib64/llvm20/share/* /app/share/
+        for f in /app/bin/*-20; do if [ -L $f -a -f ${f%-20} ]; then rm $f; fi; done
+        ln -sfn ../../../liblldb.so.20.1 /app/lib64/python3.14/site-packages/lldb/_lldb.so
         ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff
         rm -f /app/bin/ld