The package rpms/llvm.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/llvm.git/commit/?id=492d5944f48c29ab....
Change: +%ifarch aarch64 s390x
Thanks.
Full change: ============
commit 2d83cf0031e0bb176dcb488a6985d26112e8d0b0 Author: Timm Bäder tbaeder@redhat.com Date: Tue Dec 3 14:49:10 2024 +0100
Update to 19.1.5
diff --git a/llvm.spec b/llvm.spec index d8fa98e..d97304c 100644 --- a/llvm.spec +++ b/llvm.spec @@ -2,7 +2,7 @@ #region version %global maj_ver 19 %global min_ver 1 -%global patch_ver 4 +%global patch_ver 5 #global rc_ver 4
%bcond_with snapshot_build @@ -182,7 +182,7 @@ #region main package Name: %{pkg_name_llvm} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The Low Level Virtual Machine
License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -2505,6 +2505,9 @@ fi
#region changelog %changelog +* Tue Dec 03 2024 Timm Bäder tbaeder@redhat.com - 19.1.5-1 +- Update to 19.1.5 + * Tue Nov 26 2024 Tulio Magno Quites Machado Filho tuliom@redhat.com - 19.1.4-2 - Enable LLVM_ENABLE_ZSTD (rhbz#2321848)
diff --git a/sources b/sources index 6d6e95d..9b399d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (llvm-project-19.1.4.src.tar.xz) = a586f8a41dde5e0d9ca6d8c58e9ef2a2e59b70a86d2e2c46106dc31b5c096bb80af0cdbdb486179e9cc676a540099f49a1c2db9e5e84c50362db1f72e9af6906 -SHA512 (llvm-project-19.1.4.src.tar.xz.sig) = 3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764 +SHA512 (llvm-project-19.1.5.src.tar.xz.sig) = a438c86ce882eb1ac3e50842937068794ed162bb1b7ded68a2fe3ec2ab4f57cc38aee667cfb46afe6da22eef7ed1cb65820a473f63bd5a0dc6aad41df7bfad54 +SHA512 (llvm-project-19.1.5.src.tar.xz) = 648854e9c91fdcc5c677ce3800e046f2060b998a45cf9f7eebe02898431b3924f9348b6fc366102cd4fdda72dcb8f32076f98aa69927e0e20b3f1007fba10b22
commit 492d5944f48c29abbdf9fd6542e45ac481d22d93 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Wed Nov 27 09:12:54 2024 -0300
Filter out test libarcher :: races/taskwait-depend.c
This test has been failling intermittently in the LLVM snapshots on aarch64 and s390x. This is being tracked upstream as https://github.com/llvm/llvm-project/issues/117773 .
diff --git a/llvm.spec b/llvm.spec index aab1874..d8fa98e 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1605,6 +1605,13 @@ test_list_filter_out+=("libomp :: worksharing/for/omp_collapse_one_int.c") test_list_filter_out+=("libomp :: flush/omp_flush.c") %endif
+%ifarch aarch64 s390x +# The following test has been failling intermittently on aarch64 and s390x. +# Re-enable it after https://github.com/llvm/llvm-project/issues/117773 +# gets fixed. +test_list_filter_out+=("libarcher :: races/taskwait-depend.c") +%endif + # The following tests seem pass on ppc64le and x86_64 and aarch64 only: %ifnarch ppc64le x86_64 s390x aarch64 # Passes on ppc64le:
commit 1c58c94e16c1bcb84c6e3ef4f55709bef32766d4 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Tue Nov 26 15:20:32 2024 -0300
Ensure LLVM_ENABLE_ZLIB is always enabled
Set LLVM_ENABLE_ZLIB=FORCE_ON in order to cause the build to error if zlib is not found.
diff --git a/llvm.spec b/llvm.spec index cd9e401..aab1874 100644 --- a/llvm.spec +++ b/llvm.spec @@ -974,7 +974,7 @@ popd -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \\ -DLLVM_ENABLE_PROJECTS="%{projects}" \\ -DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp;offload" \\ - -DLLVM_ENABLE_ZLIB:BOOL=ON \\ + -DLLVM_ENABLE_ZLIB:BOOL=FORCE_ON \\ -DLLVM_ENABLE_ZSTD:BOOL=FORCE_ON \\ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{experimental_targets_to_build} \\ -DLLVM_INCLUDE_BENCHMARKS=OFF \\
commit dff61b318d0a6495c9c2e555a61c15c8592a1658 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Tue Nov 26 09:41:36 2024 -0300
Enable LLVM_ENABLE_ZSTD
Fixes rhbz#2321848.
diff --git a/llvm.spec b/llvm.spec index 93bf864..cd9e401 100644 --- a/llvm.spec +++ b/llvm.spec @@ -182,7 +182,7 @@ #region main package Name: %{pkg_name_llvm} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine
License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -291,6 +291,7 @@ BuildRequires: cmake BuildRequires: chrpath BuildRequires: ninja-build BuildRequires: zlib-devel +BuildRequires: libzstd-devel BuildRequires: libffi-devel BuildRequires: ncurses-devel # This intentionally does not use python3_pkgversion. RHEL 8 does not have @@ -974,6 +975,7 @@ popd -DLLVM_ENABLE_PROJECTS="%{projects}" \\ -DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp;offload" \\ -DLLVM_ENABLE_ZLIB:BOOL=ON \\ + -DLLVM_ENABLE_ZSTD:BOOL=FORCE_ON \\ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{experimental_targets_to_build} \\ -DLLVM_INCLUDE_BENCHMARKS=OFF \\ -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \\ @@ -2496,6 +2498,9 @@ fi
#region changelog %changelog +* Tue Nov 26 2024 Tulio Magno Quites Machado Filho tuliom@redhat.com - 19.1.4-2 +- Enable LLVM_ENABLE_ZSTD (rhbz#2321848) + * Thu Nov 21 2024 Timm Bäder tbaeder@redhat.com - 19.1.4-1 - Update to 19.1.4
commit ceddcfca8a13ec20125529aed4db37ca3ced1af6 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Fri Nov 22 10:17:40 2024 -0300
Remove patch applied upstream
PR #114907 has been merged on LLVM 20.
diff --git a/llvm.spec b/llvm.spec index 58fadb3..93bf864 100644 --- a/llvm.spec +++ b/llvm.spec @@ -274,7 +274,6 @@ Patch1801: 18-99273.patch # https://github.com/llvm/llvm-project/pull/114907 Patch1802: 0001-profile-Use-base-vaddr-for-__llvm_write_binary_ids-n.patch Patch1903: 0001-profile-Use-base-vaddr-for-__llvm_write_binary_ids-n.patch -Patch2001: 0001-profile-Use-base-vaddr-for-__llvm_write_binary_ids-n.patch
%if 0%{?rhel} == 8 %global python3_pkgversion 3.12
commit 8c5decbefcf4565a11e96fd09dae35978f90bcca Author: Nikita Popov npopov@redhat.com Date: Thu Nov 21 10:15:19 2024 +0000
Fix RHEL 9 gating issues
This does two changes: * Add libomp -> llvm-libs dependency to satisfy rpmdeps. * Add LLVM_USE_PERF to bundle_compat_lib to avoid an ABI change.
I've introduces a cmake_common_args variable so we have a place to put cmake variables that should apply to both the main build and the compat build.
diff --git a/llvm.spec b/llvm.spec index ab4335b..58fadb3 100644 --- a/llvm.spec +++ b/llvm.spec @@ -648,6 +648,7 @@ Summary: OpenMP runtime for clang
+Requires: %{pkg_name_llvm}-libs%{?_isa} = %{version}-%{release} Requires: elfutils-libelf%{?_isa}
Provides: libomp(major) = %{maj_ver} @@ -884,7 +885,18 @@ popd %endif
#region cmake options -%global cmake_config_args "" + +# Common cmake arguments used by both the normal build and bundle_compat_lib. +# Any ABI-affecting flags should be in here. +%global cmake_common_args \\ + -DLLVM_ENABLE_EH=ON \\ + -DLLVM_ENABLE_RTTI=ON \\ + -DLLVM_USE_PERF=ON \\ + -DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \\ + -DBUILD_SHARED_LIBS=OFF \\ + -DLLVM_BUILD_LLVM_DYLIB=ON + +%global cmake_config_args %{cmake_common_args}
#region clang options %global cmake_config_args %{cmake_config_args} \\ @@ -951,19 +963,16 @@ popd -DLLVM_APPEND_VC_REV:BOOL=OFF \\ -DLLVM_BUILD_EXAMPLES:BOOL=OFF \\ -DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \\ - -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \\ -DLLVM_BUILD_RUNTIME:BOOL=ON \\ -DLLVM_BUILD_TOOLS:BOOL=ON \\ -DLLVM_BUILD_UTILS:BOOL=ON \\ -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \\ -DLLVM_DEFAULT_TARGET_TRIPLE=%{llvm_triple} \\ -DLLVM_DYLIB_COMPONENTS="all" \\ - -DLLVM_ENABLE_EH=ON \\ -DLLVM_ENABLE_FFI:BOOL=ON \\ -DLLVM_ENABLE_LIBCXX:BOOL=OFF \\ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON \\ -DLLVM_ENABLE_PROJECTS="%{projects}" \\ - -DLLVM_ENABLE_RTTI:BOOL=ON \\ -DLLVM_ENABLE_RUNTIMES="compiler-rt;openmp;offload" \\ -DLLVM_ENABLE_ZLIB:BOOL=ON \\ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{experimental_targets_to_build} \\ @@ -975,10 +984,8 @@ popd -DLLVM_INSTALL_UTILS:BOOL=ON \\ -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \\ -DLLVM_PARALLEL_LINK_JOBS=1 \\ - -DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \\ -DLLVM_TOOLS_INSTALL_DIR:PATH=bin \\ -DLLVM_UNREACHABLE_OPTIMIZE:BOOL=OFF \\ - -DLLVM_USE_PERF:BOOL=ON \\ -DLLVM_UTILS_INSTALL_DIR:PATH=bin #endregion llvm options
@@ -1006,7 +1013,6 @@ popd
#region misc options %global cmake_config_args %{cmake_config_args} \\ - -DBUILD_SHARED_LIBS:BOOL=OFF \\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \\ -DENABLE_LINKER_BUILD_ID:BOOL=ON \\ @@ -1098,14 +1104,10 @@ cd .. -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_libdir}/llvm%{compat_maj_ver}/ \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_ENABLE_EH=ON \ - -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_PROJECTS="clang;lldb" \ - -DLLVM_TARGETS_TO_BUILD=%{targets_to_build} \ -DLLVM_INCLUDE_BENCHMARKS=OFF \ - -DLLVM_INCLUDE_TESTS=OFF + -DLLVM_INCLUDE_TESTS=OFF \ + %{cmake_common_args}
%ninja_build -C ../llvm-compat-libs LLVM %ninja_build -C ../llvm-compat-libs libclang.so
commit dd8479fbbe7f7793d71694195857a2443903f470 Author: Konrad Kleine kkleine@redhat.com Date: Wed Nov 20 11:45:11 2024 +0100
Better detect last run script in mock chroot
Before when running one of the following targets it could be that there were multiple run files in `/var/lib/mock/$(MOCK_CHROOT)/root/var/tmp`.
``` edit-last-failing-script - Opens the last failing or running script from mock in your editor of choice for you to edit it and later re-run it in mock with: "make mockbuild-rerun-last-script-...". mockbuild-rerun-last-script - Re-runs the last failing or running script of your release/mock mockbuild. ```
The function to edit the last one that was run sometimes picked the wrong file. Now we sort the files in there aforementioned directory before editing or running it again.
diff --git a/Makefile b/Makefile index 7fdb622..0d91301 100644 --- a/Makefile +++ b/Makefile @@ -72,19 +72,26 @@ mockbuild-snapshot: srpm-snapshot get-srpm-snapshot
######### Edit-last-failing-script
+.PHONY: get-last-run-script +## Get the file that was last modified in /var/tmp/ within the chroot. +get-last-run-script: + $(eval last_run_script:=/var/tmp/$(shell ls -t1 /var/lib/mock/$(MOCK_CHROOT)/root/var/tmp | head -n1)) + $(info last_run_script=$(last_run_script)) + @echo > /dev/null + .PHONY: edit-last-failing-script ## Opens the last failing or running script from mock in your editor ## of choice for you to edit it and later re-run it in mock with: -## "make mockbuild-rerun-last-script-...". -edit-last-failing-script: - $$EDITOR /var/lib/mock/$(MOCK_CHROOT)/root/var/tmp/rpm-tmp.* +## "make mockbuild-rerun-last-script". +edit-last-failing-script: get-last-run-script + $$EDITOR /var/lib/mock/$(MOCK_CHROOT)/root$(last_run_script)
######### Re-run the last failing script from mock
.PHONY: mockbuild-rerun-last-script ## Re-runs the last failing or running script of your release/mock mockbuild. -mockbuild-rerun-last-script: - mock --root=$(MOCK_CHROOT) --shell 'sh -e /var/tmp/rpm-tmp.*' +mockbuild-rerun-last-script: get-last-run-script + mock --root=$(MOCK_CHROOT) --shell 'sh -e $(last_run_script)'
.PHONY: help # Based on https://gist.github.com/rcmachado/af3db315e31383502660
arch-excludes@lists.fedoraproject.org