From bc6563f7fc27075fbccb06bc20d9c70fe37b941f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 16 Mar 2025 17:07:07 -0400 Subject: [PATCH 1/6] F42 --- container.yaml | 73 +++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/container.yaml b/container.yaml index ed96a0f..422446e 100644 --- a/container.yaml +++ b/container.yaml @@ -1,52 +1,63 @@ flatpak: id: org.fedoraproject.Sdk.Extension.llvm19 - branch: f41 + branch: f42 build-extension: true runtime: org.fedoraproject.Sdk - runtime-version: f41 + runtime-version: f42 sdk: org.fedoraproject.Sdk - name: f41/llvm19 + name: f42/llvm19 component: llvm19-flatpak packages: - - clang - - clang-analyzer - - clang-devel - - clang-libs - - clang-tools-extra - - clang-tools-extra-devel - - compiler-rt - - git-clang-format + - clang19 + - clang19-analyzer + - clang19-devel + - clang19-libs + - clang19-tools-extra + - clang19-tools-extra-devel + - compiler-rt19 + - git-clang-format19 - libcxx - libcxx-devel - libcxxabi - libcxxabi-devel - - libomp - - libomp-devel - - lld - - lld-devel - - lld-libs - - lldb - - lldb-devel - - llvm - - llvm-cmake-utils - - llvm-devel - - llvm-libs - - llvm-test + - libomp19 + - libomp19-devel + - lld19 + - lld19-devel + - lld19-libs + - lldb19 + - lldb19-devel + - llvm19 + - llvm19-cmake-utils + - llvm19-devel + - llvm19-googletest + - llvm19-libs + - llvm-libunwind + - llvm-libunwind-devel + - llvm19-test - python3-clang - python3-lit - python3-lldb # for cleanup-commands (part of runtime) - coreutils-single - - rpm - - sed cleanup-commands: | - for f in `rpm -ql clang{,-libs,-devel,-tools-extra{,-devel}} compiler-rt git-clang-format lib{cxx{,abi},omp}{,-devel} lld{,-devel,-libs} lldb{,-devel} llvm{,-cmake-utils,-devel,-libs,-test} python3-{clang,lit,lldb}`; do \ - case $f in /usr/lib/.build-id*) 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; \ - done - ln -sfn llvm-config-64 /app/bin/llvm-config + mkdir -p /app + find /app -mindepth 1 -type d -empty -delete + mv /usr/lib64/llvm19/* /app/ + mkdir -p /app/lib/clang + mv /usr/lib/clang/19 /app/lib/clang/ + mkdir -p /app/include/c++ + mv /usr/include/c++/v1 /app/include/c++/ + mv /usr/include/llvm-libunwind/ /app/include/ + mv /usr/lib64/libc++* /app/lib/ + mv /usr/lib64/libunwind* /app/lib/ + ln -s libunwind.so.1 /app/lib/libunwind.so + mv /usr/lib/python*/ /app/lib/ + find /app/lib/python*/site-packages/{_distutils_hack,pkg_resources,setuptools*} -delete + mv /usr/lib64/python*/site-packages/[^_]* /app/lib/python*/site-packages/ + ln -sfn ../../../../lib/liblldb.so /app/lib/python*/site-packages/lldb/_lldb.so ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff - for f in /app/bin/*-19; do if [ -L $f -a -f ${f%-19} ]; then rm $f; fi; done + ln -s lib /app/lib64 rm -f /app/bin/ld echo -e "#!/bin/sh\nexport PATH=\$PATH:/usr/lib/sdk/llvm19/bin" > /app/enable.sh chmod +x /app/enable.sh From 985df21faf7364a1bb6c4e8875a3a76b0408dc67 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 27 Mar 2025 17:36:32 -0400 Subject: [PATCH 2/6] Use flatpak-app-config --- container.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/container.yaml b/container.yaml index 422446e..a279bce 100644 --- a/container.yaml +++ b/container.yaml @@ -38,6 +38,7 @@ flatpak: - python3-clang - python3-lit - python3-lldb + - llvm19-flatpak-config # for cleanup-commands (part of runtime) - coreutils-single cleanup-commands: | @@ -59,5 +60,3 @@ flatpak: ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff ln -s lib /app/lib64 rm -f /app/bin/ld - echo -e "#!/bin/sh\nexport PATH=\$PATH:/usr/lib/sdk/llvm19/bin" > /app/enable.sh - chmod +x /app/enable.sh From b1471a0e41c5107823ff6862d8dd446b18674fb4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 2 Apr 2025 21:03:39 -0400 Subject: [PATCH 3/6] Fix clang resource dir The new package layout for llvm means that CLANG_RESOURCE_DIR is set to ../../../lib/clang/NN, which means that the actual binaries need to be have a similar layout even though we only have one version in each extension. --- container.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/container.yaml b/container.yaml index a279bce..23290c4 100644 --- a/container.yaml +++ b/container.yaml @@ -42,10 +42,12 @@ flatpak: # for cleanup-commands (part of runtime) - coreutils-single cleanup-commands: | - mkdir -p /app find /app -mindepth 1 -type d -empty -delete - mv /usr/lib64/llvm19/* /app/ - mkdir -p /app/lib/clang + mkdir -p /app/bin /app/lib/clang /app/libexec /app/share + mv /usr/lib64/llvm19/ /app/lib/ + pushd /app/bin ; ln -s ../lib/llvm19/bin/* . ; popd + pushd /app/lib ; ln -s llvm19/lib/* . ; popd + pushd /app/share ; ln -s ../lib/llvm19/share/* . ; popd mv /usr/lib/clang/19 /app/lib/clang/ mkdir -p /app/include/c++ mv /usr/include/c++/v1 /app/include/c++/ @@ -57,6 +59,6 @@ flatpak: find /app/lib/python*/site-packages/{_distutils_hack,pkg_resources,setuptools*} -delete mv /usr/lib64/python*/site-packages/[^_]* /app/lib/python*/site-packages/ ln -sfn ../../../../lib/liblldb.so /app/lib/python*/site-packages/lldb/_lldb.so - ln -sfn ../share/clang/clang-format-diff.py /app/bin/clang-format-diff + ln -sfn ../lib/llvm19/share/clang/clang-format-diff.py /app/bin/clang-format-diff ln -s lib /app/lib64 rm -f /app/bin/ld From afd4eb29e0d84c6d9473f7c977affdb51cca604d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Apr 2025 19:36:58 -0400 Subject: [PATCH 4/6] setuptools is no longer a runtime dependency --- container.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/container.yaml b/container.yaml index 23290c4..3e6afa5 100644 --- a/container.yaml +++ b/container.yaml @@ -56,7 +56,6 @@ flatpak: mv /usr/lib64/libunwind* /app/lib/ ln -s libunwind.so.1 /app/lib/libunwind.so mv /usr/lib/python*/ /app/lib/ - find /app/lib/python*/site-packages/{_distutils_hack,pkg_resources,setuptools*} -delete mv /usr/lib64/python*/site-packages/[^_]* /app/lib/python*/site-packages/ ln -sfn ../../../../lib/liblldb.so /app/lib/python*/site-packages/lldb/_lldb.so ln -sfn ../lib/llvm19/share/clang/clang-format-diff.py /app/bin/clang-format-diff From 4956af11809a37d52016fa7b3fb5ca7541a3182d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 30 Sep 2025 17:38:46 -0400 Subject: [PATCH 5/6] F43 --- container.yaml | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/container.yaml b/container.yaml index 3e6afa5..32a9893 100644 --- a/container.yaml +++ b/container.yaml @@ -1,11 +1,11 @@ flatpak: id: org.fedoraproject.Sdk.Extension.llvm19 - branch: f42 + branch: f43 build-extension: true runtime: org.fedoraproject.Sdk - runtime-version: f42 + runtime-version: f43 sdk: org.fedoraproject.Sdk - name: f42/llvm19 + name: f43/llvm19 component: llvm19-flatpak packages: - clang19 @@ -41,23 +41,20 @@ flatpak: - llvm19-flatpak-config # for cleanup-commands (part of runtime) - coreutils-single + - rpm + - sed cleanup-commands: | - find /app -mindepth 1 -type d -empty -delete - mkdir -p /app/bin /app/lib/clang /app/libexec /app/share - mv /usr/lib64/llvm19/ /app/lib/ - pushd /app/bin ; ln -s ../lib/llvm19/bin/* . ; popd - pushd /app/lib ; ln -s llvm19/lib/* . ; popd - pushd /app/share ; ln -s ../lib/llvm19/share/* . ; popd - mv /usr/lib/clang/19 /app/lib/clang/ - mkdir -p /app/include/c++ - mv /usr/include/c++/v1 /app/include/c++/ - mv /usr/include/llvm-libunwind/ /app/include/ - mv /usr/lib64/libc++* /app/lib/ - mv /usr/lib64/libunwind* /app/lib/ - ln -s libunwind.so.1 /app/lib/libunwind.so - mv /usr/lib/python*/ /app/lib/ - mv /usr/lib64/python*/site-packages/[^_]* /app/lib/python*/site-packages/ - ln -sfn ../../../../lib/liblldb.so /app/lib/python*/site-packages/lldb/_lldb.so - ln -sfn ../lib/llvm19/share/clang/clang-format-diff.py /app/bin/clang-format-diff - ln -s lib /app/lib64 + mkdir -p /app/{bin,include,lib64,libexec,share} + for f in `rpm -aql clang19* compiler-rt19 git-clang-format19 libcxx* libomp19* lld19* lldb19* llvm19* 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; mv $f $d; fi; \ + done + mv /app/lib64/llvm19/bin/* /app/bin/ + mv /app/lib64/llvm19/include/* /app/include/ + mv /app/lib64/llvm19/lib/* /app/lib64/ + mv /app/lib64/llvm19/libexec/* /app/libexec/ + mv /app/lib64/llvm19/share/* /app/share/ + for f in /app/bin/*-19; do if [ -L $f -a -f ${f%-19} ]; then rm $f; fi; done + ln -sfn ../../../liblldb.so.19.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 From d11b471fc75e523318f3e40a55678d91ff58971a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 25 Mar 2026 16:16:46 -0400 Subject: [PATCH 6/6] F44 --- container.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container.yaml b/container.yaml index 32a9893..3fdb6e9 100644 --- a/container.yaml +++ b/container.yaml @@ -1,11 +1,11 @@ flatpak: id: org.fedoraproject.Sdk.Extension.llvm19 - branch: f43 + branch: f44 build-extension: true runtime: org.fedoraproject.Sdk - runtime-version: f43 + runtime-version: f44 sdk: org.fedoraproject.Sdk - name: f43/llvm19 + name: f44/llvm19 component: llvm19-flatpak packages: - clang19