From 68ac31f50397784e8de6909acfa76445ff9727011b87da58963b9206855a8284 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 1 Mar 2024 21:55:45 +0000 Subject: [PATCH 1/5] Accepting request 1154119 from home:pgajdos:l - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1154119 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=59 --- llvm14.changes | 5 +++++ llvm14.spec | 52 +++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/llvm14.changes b/llvm14.changes index 3d68aa7..22902bf 100644 --- a/llvm14.changes +++ b/llvm14.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 12:28:41 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/llvm14.spec b/llvm14.spec index eb8170c..9b1858f 100644 --- a/llvm14.spec +++ b/llvm14.spec @@ -802,29 +802,29 @@ 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 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch24 -p1 -%patch25 -p2 -%patch27 -p2 -%patch33 -p2 -%patch37 -p2 -%patch39 -p2 +%patch -P 0 -p2 +%patch -P 1 -p2 +%patch -P 5 -p1 +%patch -P 13 -p1 +%patch -P 14 -p1 +%patch -P 20 -p1 +%patch -P 21 -p1 +%patch -P 22 -p1 +%patch -P 24 -p1 +%patch -P 25 -p2 +%patch -P 27 -p2 +%patch -P 33 -p2 +%patch -P 37 -p2 +%patch -P 39 -p2 pushd clang-%{_version}.src -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch6 -p1 -%patch9 -p2 -%patch34 -p2 -%patch36 -p2 +%patch -P 2 -p1 +%patch -P 3 -p1 +%patch -P 4 -p1 +%patch -P 6 -p1 +%patch -P 9 -p2 +%patch -P 34 -p2 +%patch -P 36 -p2 # We hardcode openSUSE rm unittests/Driver/DistroTest.cpp @@ -835,24 +835,24 @@ 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 %{SOURCE10} include/mach-o popd pushd compiler-rt-%{_version}.src -%patch35 -p2 +%patch -P 35 -p2 popd %if %{with lldb} pushd lldb-%{_version}.src -%patch11 -p1 -%patch38 -p2 +%patch -P 11 -p1 +%patch -P 38 -p2 popd %endif From 57c38099b3506d471f37afc53bf0da568c3c5f3014bf21936b7801d95bb1ae9d Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 00:34:56 +0000 Subject: [PATCH 2/5] - Disable test that fails on ppc64le. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=60 --- llvm14.changes | 5 +++++ llvm14.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/llvm14.changes b/llvm14.changes index 22902bf..b019995 100644 --- a/llvm14.changes +++ b/llvm14.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:28:41 UTC 2024 - pgajdos@suse.com diff --git a/llvm14.spec b/llvm14.spec index 9b1858f..622837b 100644 --- a/llvm14.spec +++ b/llvm14.spec @@ -1357,6 +1357,8 @@ sed -i '/UNSUPPORTED/i// XFAIL: powerpc-' ../tools/clang/test/Interpreter/execut # Tests hang on armv6l. sed -i '1i// UNSUPPORTED: armv6' \ ../tools/clang/test/{Interpreter/execute.cpp,Modules/{preprocess-{build-diamond.m,decluse.cpp,module.cpp},string_names.cpp}} +# 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 -r ../tools/clang/test/ClangScanDeps From 5e2c5371291fc9096f560ea093a94c71717d4784bf21d065d5f54a10b008e9da Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Mon, 4 Mar 2024 21:58:13 +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/llvm14?expand=0&rev=61 --- _constraints | 2 +- llvm14.changes | 4 +++- llvm14.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/llvm14.changes b/llvm14.changes index b019995..d5d9228 100644 --- a/llvm14.changes +++ b/llvm14.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/llvm14.spec b/llvm14.spec index 622837b..a20679d 100644 --- a/llvm14.spec +++ b/llvm14.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 3155c3bda6c4e195c78d44525c1192c25fc8ce9c480e4dd7e8d457e2c763fbf7 Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Tue, 5 Mar 2024 00:25:20 +0000 Subject: [PATCH 4/5] - Undo _constraints change, doesn't seem necessary here. OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=62 --- _constraints | 2 +- llvm14.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/llvm14.changes b/llvm14.changes index d5d9228..256aadf 100644 --- a/llvm14.changes +++ b/llvm14.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 a4d669e40add8fedbbdbc0ab93198e4b33cffafca14dc9b3992ae830c600f8de Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Thu, 7 Mar 2024 01:47:14 +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/llvm14?expand=0&rev=63 --- llvm14.changes | 6 ++++++ llvm14.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/llvm14.changes b/llvm14.changes index 256aadf..18686e4 100644 --- a/llvm14.changes +++ b/llvm14.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/llvm14.spec b/llvm14.spec index a20679d..7b7b3cd 100644 --- a/llvm14.spec +++ b/llvm14.spec @@ -948,6 +948,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 \ @@ -1035,6 +1036,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_TARGETS_TO_BUILD=%{llvm_targets} \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=%{llvm_experimental_targets} \ -DLLVM_TOOL_LLVM_EXEGESIS_BUILD:BOOL=OFF \