From 232b3872a4e67708efdac5d0b64679a56ac7d90d50c7cc39b8a29112f9cbe29c Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 1 Mar 2024 21:55:34 +0000 Subject: [PATCH 1/5] Accepting request 1154118 from home:pgajdos:l - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1154118 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm13?expand=0&rev=43 --- llvm13.changes | 5 +++++ llvm13.spec | 46 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/llvm13.changes b/llvm13.changes index 88b3eea..e7631f4 100644 --- a/llvm13.changes +++ b/llvm13.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 12:26:37 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/llvm13.spec b/llvm13.spec index bcb9a9b..319e63a 100644 --- a/llvm13.spec +++ b/llvm13.spec @@ -587,26 +587,26 @@ 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 -b 50 -b 51 -n llvm-%{_version}.src -%patch0 -p2 -%patch1 -p2 -%patch5 -p1 -%patch13 -p1 -%patch14 -p1 -%patch18 -p2 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch24 -p1 -%patch27 -p2 -%patch33 -p2 -%patch35 -p2 +%patch -P 0 -p2 +%patch -P 1 -p2 +%patch -P 5 -p1 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 18 -p2 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 22 -p1 +%patch -P 24 -p1 +%patch -P 27 -p2 +%patch -P 33 -p2 +%patch -P 35 -p2 pushd clang-%{_version}.src -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch9 -p2 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 6 -p1 +%patch -P 9 -p2 # We hardcode openSUSE rm unittests/Driver/DistroTest.cpp @@ -617,15 +617,15 @@ rm test/Driver/nacl-direct.c popd pushd clang-tools-extra-%{_version}.src -%patch10 -p2 +%patch -P 10 -p2 popd pushd compiler-rt-%{_version}.src -%patch17 -p2 +%patch -P 17 -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 %{SOURCE10} include/mach-o @@ -633,8 +633,8 @@ popd %if %{with lldb} pushd lldb-%{_version}.src -%patch11 -p1 -%patch38 -p2 +%patch -P 11 -p1 +%patch -P 38 -p2 popd %endif From 3b2ce34d98d8f7a0006f4c3fb934d25efe3a050bf76c3cec9aec16e971a11f5d Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 00:35:44 +0000 Subject: [PATCH 2/5] - Disable test that fails on ppc64le. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm13?expand=0&rev=44 --- llvm13.changes | 5 +++++ llvm13.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/llvm13.changes b/llvm13.changes index e7631f4..30b352f 100644 --- a/llvm13.changes +++ b/llvm13.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 3 20:30:50 UTC 2024 - Aaron Puchert + +- Disable test that fails on ppc64le. + ------------------------------------------------------------------- Fri Mar 1 12:26:37 UTC 2024 - pgajdos@suse.com diff --git a/llvm13.spec b/llvm13.spec index 319e63a..cc8f209 100644 --- a/llvm13.spec +++ b/llvm13.spec @@ -1180,6 +1180,8 @@ sed -i '1i; XFAIL: armv6, powerpc-' ../test/ExecutionEngine/frem.ll sed -i '1i; UNSUPPORTED: armv6' ../test/CodeGen/Generic/PBQP.ll sed -i '1i; UNSUPPORTED: armv6\n; XFAIL: powerpc-' \ ../test/ExecutionEngine/{mov64zext32,test-interp-vec-{arithm_{float,int},logical,setcond-{fp,int}}}.ll +# Missing DW_TAG_formal_parameter. Test has been moved to X86 in the meantime (https://reviews.llvm.org/D109806). +sed -i '1i; XFAIL: powerpc64le-' ../test/DebugInfo/Generic/missing-abstract-variable.ll %ifarch ppc64le # Sporadic failures, possibly races? rm ../test/tools/llvm-cov/{multithreaded-report,sources-specified}.test From b1673b0e777a0f7154384f17dd1199d22a53a11c1e5909f2e5eab2fd0b834bf4 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 21:59:25 +0000 Subject: [PATCH 3/5] - 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/llvm13?expand=0&rev=45 --- _constraints | 2 +- llvm13.changes | 4 +++- llvm13.spec | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/_constraints b/_constraints index 1e2f2c8..64618dc 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 35 - 4096 + 8192 diff --git a/llvm13.changes b/llvm13.changes index 30b352f..d25097c 100644 --- a/llvm13.changes +++ b/llvm13.changes @@ -1,6 +1,8 @@ ------------------------------------------------------------------- -Sun Mar 3 20:30:50 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/llvm13.spec b/llvm13.spec index cc8f209..7795188 100644 --- a/llvm13.spec +++ b/llvm13.spec @@ -71,7 +71,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 72d10641fd66cad6a093a9f8d874c0141cd84283586326431df6151e5e47ca32 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Tue, 5 Mar 2024 00:26:31 +0000 Subject: [PATCH 4/5] - Undo _constraints change, doesn't seem necessary here. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm13?expand=0&rev=46 --- _constraints | 2 +- llvm13.changes | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/_constraints b/_constraints index 64618dc..1e2f2c8 100644 --- a/_constraints +++ b/_constraints @@ -5,7 +5,7 @@ 35 - 8192 + 4096 diff --git a/llvm13.changes b/llvm13.changes index d25097c..835fb7d 100644 --- a/llvm13.changes +++ b/llvm13.changes @@ -2,7 +2,6 @@ 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. ------------------------------------------------------------------- From e7ebc9c219af591745c5926760d3e25913b209fbfab517d6dd9b94f25289fdbb Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Thu, 7 Mar 2024 01:49:26 +0000 Subject: [PATCH 5/5] - 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/llvm13?expand=0&rev=47 --- llvm13.changes | 6 ++++++ llvm13.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/llvm13.changes b/llvm13.changes index 835fb7d..009f5e7 100644 --- a/llvm13.changes +++ b/llvm13.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/llvm13.spec b/llvm13.spec index 7795188..e075bf4 100644 --- a/llvm13.spec +++ b/llvm13.spec @@ -751,6 +751,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 \ @@ -846,6 +847,7 @@ export LD_LIBRARY_PATH=${PWD}/build/%{_lib} -DLLVM_ENABLE_RTTI:BOOL=ON \ -DLLVM_ENABLE_PIC=ON \ -DLLVM_BINUTILS_INCDIR=%{_includedir} \ + -DPython3_EXECUTABLE=%{_bindir}/python3 \ -DLLVM_TARGETS_TO_BUILD=${TARGETS_TO_BUILD} \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${EXPERIMENTAL_TARGETS_TO_BUILD} \ %if %{with libcxx}