From 232b3872a4e67708efdac5d0b64679a56ac7d90d50c7cc39b8a29112f9cbe29c Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Fri, 1 Mar 2024 21:55:34 +0000 Subject: [PATCH] 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