From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 9 May 2021 22:50:56 +0000 (+0200)
Subject: - merged 10.3.0 from PLD
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=1480686ea9058e088ebb3c09a62da8e8460ab1a2;p=packages%2Fgcc.git

- merged 10.3.0 from PLD
---

diff --git a/branch.sh b/branch.sh
index c228596..eb61c67 100755
--- a/branch.sh
+++ b/branch.sh
@@ -2,7 +2,7 @@
 set -e
 url=git://gcc.gnu.org/git/gcc.git
 package=gcc
-tag=releases/gcc-10.2.0
+tag=releases/gcc-10.3.0
 branch=releases/gcc-10
 out=$package-branch.diff
 repo=$package.git
diff --git a/gcc.spec b/gcc.spec
index 863949b..7028646 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -96,7 +96,7 @@
 # Stable is: any major_ver and minor_ver >= 1.0
 # For TLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later)
 %define		major_ver	10
-%define		minor_ver	2.0
+%define		minor_ver	3.0
 
 Summary:	GNU Compiler Collection: the C compiler and shared files
 Summary(es.UTF-8):	Colección de compiladores GNU: el compilador C y ficheros compartidos
@@ -109,14 +109,14 @@ Epoch:		6
 License:	GPL v3+
 Group:		Development/Languages
 Source0:	https://gcc.gnu.org/pub/gcc/releases/%{name}-%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	e9fd9b1789155ad09bcf3ae747596b50
+# Source0-md5:	443c15b92614a3ce8f22e3b24ca2226a
 Source1:	%{name}-optimize-la.pl
 # check libffi version with libffi/configure.ac
 Source3:	libffi.pc.in
 Source4:	branch.sh
 # use branch.sh to update gcc-branch.diff
 Patch100:	%{name}-branch.diff
-# Patch100-md5:	3629b023e2dbf2ab7f0b49e1bf864f21
+# Patch100-md5:	a8efa1a27e26ce736a3ab51b4d1d56f2
 Patch0:		%{name}-info.patch
 Patch2:		%{name}-nodebug.patch
 Patch3:		%{name}-ada-link.patch
@@ -176,7 +176,7 @@ BuildRequires:	isl-devel >= 0.15
 BuildRequires:	libmpc-devel >= 0.8.1
 BuildRequires:	mpfr-devel >= 3.1.0
 %if %{with python}
-BuildRequires:	python-devel
+BuildRequires:	python3-devel
 BuildRequires:	rpm-pythonprov
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.211
@@ -2878,11 +2878,10 @@ for LIBDIR in %{_libdir} %{?with_multilib:%{_libdir32}} %{?with_multilib2:%{_lib
 	  < libstdc++-v3/python/hook.in	\
 	  > $LIBPATH/$(basename $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libstdc++.so.*.*.*)-gdb.py
 done
-install -d $RPM_BUILD_ROOT%{py_sitescriptdir}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_postclean
+install -d $RPM_BUILD_ROOT%{py3_sitescriptdir}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx $RPM_BUILD_ROOT%{py3_sitescriptdir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}
+%py3_comp $RPM_BUILD_ROOT%{py3_sitescriptdir}
 %else
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gcc-%{version}/python/libstdcxx
 %endif
@@ -3593,10 +3592,12 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python}
 %files -n libstdc++-gdb
 %defattr(644,root,root,755)
-%dir %{py_sitescriptdir}/libstdcxx
-%{py_sitescriptdir}/libstdcxx/*.py[co]
-%dir %{py_sitescriptdir}/libstdcxx/v6
-%{py_sitescriptdir}/libstdcxx/v6/*.py[co]
+%dir %{py3_sitescriptdir}/libstdcxx
+%{py3_sitescriptdir}/libstdcxx/*.py
+%{py3_sitescriptdir}/libstdcxx/__pycache__
+%dir %{py3_sitescriptdir}/libstdcxx/v6
+%{py3_sitescriptdir}/libstdcxx/v6/*.py
+%{py3_sitescriptdir}/libstdcxx/v6/__pycache__
 %{_datadir}/gdb/auto-load%{_libdir}/libstdc++.so.%{cxx_sover}.*.*-gdb.py
 %if %{with multilib}
 %{_datadir}/gdb/auto-load%{_libdir32}/libstdc++.so.%{cxx_sover}.*.*-gdb.py