Accepting request 1156031 from devel:tools:compiler

- Explicitly define PYTHON3_EXECUTABLE, since python 3.11 is being
  pulled in by cmake in SLE-15-SP6.
- 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.
- Use %patch -P N instead of deprecated %patchN.

OBS-URL: https://build.opensuse.org/request/show/1156031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/llvm15?expand=0&rev=13

_constraints

@@ -5,7 +5,7 @@
       <size unit="G">35</size>
     </disk>
     <memory>
-      <size unit="M">4096</size>
+      <size unit="M">8192</size>
     </memory>
   </hardware>
   <hostlabel exclude="true">SLOW_CPU</hostlabel>

llvm15.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Mar  6 03:20:24 UTC 2024 - Michael Gorse <mgorse@suse.com>
+
+- 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 <aaronpuchert@alice-dsl.net>
+
+- 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.
+
+-------------------------------------------------------------------
+Fri Mar  1 12:29:16 UTC 2024 - pgajdos@suse.com
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu Jan 11 07:38:12 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 

llvm15.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}
@@ -811,29 +812,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 -a 10 -b 50 -b 51 -n llvm-%{_version}.src
-%patch0 -p2
-%patch5 -p1
-%patch13 -p1
-%patch14 -p1
-%patch16 -p2
-%patch17 -p2
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch24 -p1
-%patch25 -p2
-%patch33 -p2
-%patch34 -p2
-%patch37 -p1
+%patch -P 0 -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 22 -p1
+%patch -P 24 -p1
+%patch -P 25 -p2
+%patch -P 33 -p2
+%patch -P 34 -p2
+%patch -P 37 -p1
 
 pushd clang-%{_version}.src
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch9 -p2
-%patch18 -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 18 -p2
+%patch -P 36 -p2
 
 # We hardcode openSUSE
 rm unittests/Driver/DistroTest.cpp
@@ -844,11 +845,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 %{SOURCE11} include/mach-o
@@ -856,17 +857,17 @@ popd
 
 %if %{with lldb}
 pushd lldb-%{_version}.src
-%patch11 -p1
+%patch -P 11 -p1
 popd
 %endif
 
 %if %{with libcxx}
 pushd libcxxabi-%{_version}.src
-%patch35 -p2
+%patch -P 35 -p2
 popd
 
 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
@@ -957,6 +958,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 \
@@ -1050,6 +1052,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} \
@@ -1358,6 +1361,8 @@ sed -i '1i; XFAIL: armv6, powerpc-' ../test/ExecutionEngine/frem.ll
 sed -i '1i; UNSUPPORTED: armv6' ../test/{CodeGen/Generic/PBQP.ll,ExecutionEngine/Orc/global-ctor-with-cast.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