Use %patch -PN

Resolves: #2188499
This commit is contained in:
Marek Polacek 2023-05-23 14:52:25 -04:00 committed by Adam Saleh
parent 423f512a77
commit e6ffa617d9

View File

@ -670,29 +670,29 @@ so that there cannot be any synchronization problems.
%prep %prep
%setup -q -n gcc-%{version}-%{DATE} -a 1 -a 4 -a 5 %setup -q -n gcc-%{version}-%{DATE} -a 1 -a 4 -a 5
%patch0 -p0 -b .hack~ %patch -P0 -p0 -b .hack~
%patch2 -p0 -b .sparc-config-detection~ %patch -P2 -p0 -b .sparc-config-detection~
%patch3 -p0 -b .libgomp-omp_h-multilib~ %patch -P3 -p0 -b .libgomp-omp_h-multilib~
%patch4 -p0 -b .libtool-no-rpath~ %patch -P4 -p0 -b .libtool-no-rpath~
%if %{build_isl} %if %{build_isl}
%patch5 -p0 -b .isl-dl~ %patch -P5 -p0 -b .isl-dl~
%patch6 -p0 -b .isl-dl2~ %patch -P6 -p0 -b .isl-dl2~
%endif %endif
%if %{build_libstdcxx_docs} %if %{build_libstdcxx_docs}
%patch7 -p0 -b .libstdc++-docs~ %patch -P7 -p0 -b .libstdc++-docs~
%endif %endif
%patch8 -p0 -b .no-add-needed~ %patch -P8 -p0 -b .no-add-needed~
%patch9 -p0 -b .Wno-format-security~ %patch -P9 -p0 -b .Wno-format-security~
%if 0%{?fedora} >= 29 || 0%{?rhel} > 7 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
%patch10 -p0 -b .rh1574936~ %patch -P10 -p0 -b .rh1574936~
%endif %endif
%patch11 -p0 -b .d-shared-libphobos~ %patch -P11 -p0 -b .d-shared-libphobos~
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
%patch100 -p1 -b .fortran-fdec-duplicates~ %patch -P100 -p1 -b .fortran-fdec-duplicates~
%patch101 -p1 -b .fortran-flogical-as-integer~ %patch -P101 -p1 -b .fortran-flogical-as-integer~
%patch102 -p1 -b .fortran-fdec-override-kind~ %patch -P102 -p1 -b .fortran-fdec-override-kind~
%patch103 -p1 -b .fortran-fdec-non-logical-if~ %patch -P103 -p1 -b .fortran-fdec-non-logical-if~
%endif %endif
%ifarch %{arm} %ifarch %{arm}
@ -705,35 +705,35 @@ rm -f gcc/testsuite/g++.dg/tsan/pthread_cond_clockwait.C
rm -f libphobos/testsuite/libphobos.gc/forkgc2.d rm -f libphobos/testsuite/libphobos.gc/forkgc2.d
#rm -rf libphobos/testsuite/libphobos.gc #rm -rf libphobos/testsuite/libphobos.gc
%patch1000 -p0 -b .libstdc++-compat~ %patch -P1000 -p0 -b .libstdc++-compat~
%patch1001 -p0 -b .libgfortran-compat~ %patch -P1001 -p0 -b .libgfortran-compat~
%if %{build_isl} %if %{build_isl}
%patch50 -p0 -b .isl-rh2155127~ %patch -P50 -p0 -b .isl-rh2155127~
%endif %endif
# Apply DTS-specific testsuite patches. # Apply DTS-specific testsuite patches.
%patch3000 -p1 -b .dts-test-0~ %patch -P3000 -p1 -b .dts-test-0~
%patch3001 -p1 -b .dts-test-1~ %patch -P3001 -p1 -b .dts-test-1~
%patch3002 -p1 -b .dts-test-2~ %patch -P3002 -p1 -b .dts-test-2~
%patch3003 -p1 -b .dts-test-3~ %patch -P3003 -p1 -b .dts-test-3~
%patch3004 -p1 -b .dts-test-4~ %patch -P3004 -p1 -b .dts-test-4~
%patch3005 -p1 -b .dts-test-5~ %patch -P3005 -p1 -b .dts-test-5~
%patch3006 -p1 -b .dts-test-6~ %patch -P3006 -p1 -b .dts-test-6~
%patch3007 -p1 -b .dts-test-7~ %patch -P3007 -p1 -b .dts-test-7~
%patch3008 -p1 -b .dts-test-8~ %patch -P3008 -p1 -b .dts-test-8~
%patch3009 -p1 -b .dts-test-9~ %patch -P3009 -p1 -b .dts-test-9~
%patch3010 -p1 -b .dts-test-10~ %patch -P3010 -p1 -b .dts-test-10~
%patch3011 -p1 -b .dts-test-11~ %patch -P3011 -p1 -b .dts-test-11~
%patch3012 -p1 -b .dts-test-12~ %patch -P3012 -p1 -b .dts-test-12~
%patch3013 -p1 -b .dts-test-13~ %patch -P3013 -p1 -b .dts-test-13~
%patch3014 -p1 -b .dts-test-14~ %patch -P3014 -p1 -b .dts-test-14~
%patch3015 -p1 -b .dts-test-15~ %patch -P3015 -p1 -b .dts-test-15~
%patch3016 -p1 -b .dts-test-16~ %patch -P3016 -p1 -b .dts-test-16~
%patch3017 -p1 -b .dts-test-17~ %patch -P3017 -p1 -b .dts-test-17~
%patch3018 -p1 -b .dts-test-18~ %patch -P3018 -p1 -b .dts-test-18~
%if 0%{?rhel} <= 7 %if 0%{?rhel} <= 7
%patch3019 -p1 -b .dts-test-19~ %patch -P3019 -p1 -b .dts-test-19~
%endif %endif
find gcc/testsuite -name \*.pr96939~ | xargs rm -f find gcc/testsuite -name \*.pr96939~ | xargs rm -f