From 08089638cf4ea9d3e350efa78e91f3d386ed806efad917b34f944fd4e96c62cb Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 1 Mar 2024 21:56:30 +0000 Subject: [PATCH 1/4] Accepting request 1154122 from home:pgajdos:l - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1154122 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=27 --- llvm16.changes | 5 +++++ llvm16.spec | 42 +++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/llvm16.changes b/llvm16.changes index 83f559c..2ed6676 100644 --- a/llvm16.changes +++ b/llvm16.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 12:29:50 UTC 2024 - pgajdos@suse.com + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu Jan 11 07:38:12 UTC 2024 - Fabian Vogt diff --git a/llvm16.spec b/llvm16.spec index 2dd9f5c..ad46ef3 100644 --- a/llvm16.spec +++ b/llvm16.spec @@ -821,25 +821,25 @@ This package contains the development files for Polly. %prep %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -b 50 -b 51 -n llvm-%{_version}.src -%patch0 -p2 -%patch1 -p2 -%patch5 -p1 -%patch13 -p1 -%patch14 -p1 -%patch16 -p2 -%patch17 -p2 -%patch20 -p1 -%patch21 -p1 -%patch24 -p1 -%patch25 -p2 +%patch -P 0 -p2 +%patch -P 1 -p2 +%patch -P 5 -p1 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 16 -p2 +%patch -P 17 -p2 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 24 -p1 +%patch -P 25 -p2 pushd clang-%{_version}.src -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch9 -p2 -%patch18 -p2 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 6 -p1 +%patch -P 9 -p2 +%patch -P 18 -p2 # We hardcode openSUSE rm unittests/Driver/DistroTest.cpp @@ -850,11 +850,11 @@ rm test/Driver/nacl-direct.c popd pushd clang-tools-extra-%{_version}.src -%patch10 -p2 +%patch -P 10 -p2 popd pushd lld-%{_version}.src -%patch26 -p1 +%patch -P 26 -p1 # lld got a compile-time dependency on libunwind that we don't want. (https://reviews.llvm.org/D86805) mkdir include/mach-o cp %{SOURCE12} include/mach-o @@ -862,13 +862,13 @@ popd %if %{with lldb} pushd lldb-%{_version}.src -%patch11 -p1 +%patch -P 11 -p1 popd %endif %if %{with libcxx} pushd libcxx-%{_version}.src -%patch15 -p2 +%patch -P 15 -p2 rm test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp rm test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp rm test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp From 65536c2b55d760c8d3feba8b824effdad29725c102941cdd70c27bbe6be1f594 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 00:42:50 +0000 Subject: [PATCH 2/4] - Disable test that fails on ppc64le. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=28 --- llvm16.changes | 5 +++++ llvm16.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/llvm16.changes b/llvm16.changes index 2ed6676..2027181 100644 --- a/llvm16.changes +++ b/llvm16.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 3 20:41:46 UTC 2024 - Aaron Puchert + +- Disable test that fails on ppc64le. + ------------------------------------------------------------------- Fri Mar 1 12:29:50 UTC 2024 - pgajdos@suse.com diff --git a/llvm16.spec b/llvm16.spec index ad46ef3..86f0fc0 100644 --- a/llvm16.spec +++ b/llvm16.spec @@ -1379,6 +1379,8 @@ sed -i '1i// XFAIL: target=powerpc-{{.*}}' ../tools/clang/test/Interpreter/{code # Tests hang on armv6l. sed -i '1i// UNSUPPORTED: target=armv6{{.*}}' \ ../tools/clang/test/{Interpreter/{code-undo,execute,execute-weak}.cpp,Modules/{preprocess-{build-diamond.m,decluse.cpp,module.cpp},string_names.cpp}} +# We get "tail call" instead of "musttail call" (https://reviews.llvm.org/D138954). +sed -i '1i// XFAIL: target=powerpc{{.*}}' ../tools/clang/test/CodeGenCoroutines/pr56329.cpp %ifarch ppc64le # Sporadic failures, possibly races? rm -r ../tools/clang/test/ClangScanDeps From 0ca844b2acc83b2284121a1e1ffe575dce91d2fe3dd4ad41c2ef5b586b307317 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 21:54:16 +0000 Subject: [PATCH 3/4] - Fix PowerPC triples: use powerpc[64[le]] instead of ppc[64[le]]. - Require 8 GB memory for 64-bit architectures to prevent OOM. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=29 --- _constraints | 2 +- llvm16.changes | 4 +++- llvm16.spec | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/_constraints b/_constraints index eb02688..323953f 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 35 - 4096 + 8192 SLOW_CPU diff --git a/llvm16.changes b/llvm16.changes index 2027181..082f19e 100644 --- a/llvm16.changes +++ b/llvm16.changes @@ -1,6 +1,8 @@ ------------------------------------------------------------------- -Sun Mar 3 20:41:46 UTC 2024 - Aaron Puchert +Mon Mar 4 21:29:51 UTC 2024 - Aaron Puchert +- Fix PowerPC triples: use powerpc[64[le]] instead of ppc[64[le]]. +- Require 8 GB memory for 64-bit architectures to prevent OOM. - Disable test that fails on ppc64le. ------------------------------------------------------------------- diff --git a/llvm16.spec b/llvm16.spec index 86f0fc0..79d96ba 100644 --- a/llvm16.spec +++ b/llvm16.spec @@ -70,7 +70,8 @@ # See https://build.opensuse.org/request/show/968066. %define target_cpu armv6kz %else -%define target_cpu %{_target_cpu} +# What RPM spells ppc, GCC spells powerpc. +%define target_cpu %{lua:print((string.gsub(rpm.expand("%{_target_cpu}"), "ppc", "powerpc")))} %endif %ifarch %{arm} From 4f952a9730aa05ba14411ad3266a166374d353f0feefa33d8b9ab0326e897758 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Thu, 7 Mar 2024 01:24:45 +0000 Subject: [PATCH 4/4] - Explicitly define PYTHON3_EXECUTABLE, since python 3.11 is being pulled in by cmake in SLE-15-SP6. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm16?expand=0&rev=30 --- llvm16.changes | 6 ++++++ llvm16.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/llvm16.changes b/llvm16.changes index 082f19e..a3272d6 100644 --- a/llvm16.changes +++ b/llvm16.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 6 03:20:24 UTC 2024 - Michael Gorse + +- Explicitly define PYTHON3_EXECUTABLE, since python 3.11 is being + pulled in by cmake in SLE-15-SP6. + ------------------------------------------------------------------- Mon Mar 4 21:29:51 UTC 2024 - Aaron Puchert diff --git a/llvm16.spec b/llvm16.spec index 79d96ba..8b30a2a 100644 --- a/llvm16.spec +++ b/llvm16.spec @@ -962,6 +962,7 @@ avail_mem=$(awk '/MemAvailable/ { print $2 }' /proc/meminfo) -DLLVM_PARALLEL_LINK_JOBS="$max_link_jobs" \ -DENABLE_LINKER_BUILD_ID=ON \ -DLLVM_BINUTILS_INCDIR=%{_includedir} \ + -DPython3_EXECUTABLE=%{_bindir}/python3 \ -DLLVM_BUILD_TOOLS:BOOL=OFF \ -DLLVM_BUILD_UTILS:BOOL=OFF \ -DLLVM_BUILD_EXAMPLES:BOOL=OFF \ @@ -1054,6 +1055,7 @@ export LD_LIBRARY_PATH=%{sourcedir}/build/%{_lib} -DLLVM_ENABLE_RTTI:BOOL=ON \ -DLLVM_ENABLE_PIC=ON \ -DLLVM_BINUTILS_INCDIR=%{_includedir} \ + -DPython3_EXECUTABLE=%{_bindir}/python3 \ -DLLVM_ENABLE_ZSTD:BOOL=OFF \ -DLLVM_TARGETS_TO_BUILD=%{llvm_targets} \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{llvm_experimental_targets} \