[packages/gcc/GCC_8] - updated to 8.4.0

[qboosh]

commit aa42a555344981fea7bd884f23a8a1cbf37f4655
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 9 21:21:16 2020 +0100

    - updated to 8.4.0

 branch.sh | 26 +++++++++++++-------------
 gcc.spec  | 16 +++++++---------
 2 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index e1a7cc2..fd66dbc 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -93,7 +93,7 @@
 # Stable is: any major_ver and minor_ver >= 1.0
 # For PLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later)
 %define		major_ver	8
-%define		minor_ver	3.0
+%define		minor_ver	4.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
@@ -105,15 +105,15 @@ Release:	1
 Epoch:		6
 License:	GPL v3+
 Group:		Development/Languages
-Source0:	https://ftp.gnu.org/pub/gnu/gcc/gcc-%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	65b210b4bfe7e060051f799e0f994896
+Source0:	https://ftp.gnu.org/gnu/gcc/gcc-%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	bb815a8e3b7be43c4a26fa89dbbd9795
 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:	984c895d5efef6f0423894b22e0f89ee
+# Patch100-md5:	f13ade4c91d6a65bcccb315d67054d91
 Patch0:		%{name}-info.patch
 Patch2:		%{name}-nodebug.patch
 Patch3:		%{name}-ada-link.patch
@@ -176,7 +176,7 @@ BuildRequires:	mpfr-devel >= 2.4.2
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.211
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo >= 4.7
 BuildRequires:	xz
@@ -940,9 +940,7 @@ Summary:	C++ standard library API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki standardowej C++
 License:	FDL v1.3 (mainly), GPL v3+ (doxygen generated parts)
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description -n libstdc++-apidocs
 API and internal documentation for C++ standard library.
@@ -2666,7 +2664,7 @@ Extensions dla języka C.
 
 %prep
 %setup -q
-%patch100 -p0
+%patch100 -p1
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
diff --git a/branch.sh b/branch.sh
index 73296f8..473fa56 100755
--- a/branch.sh
+++ b/branch.sh
@@ -1,25 +1,25 @@
 #!/bin/sh
 set -e
+url=git://gcc.gnu.org/git/gcc.git
 package=gcc
-svn=svn://gcc.gnu.org/svn/$package
-branch=branches/$package-8-branch
-tag=tags/${package}_8_3_0_release
+tag=releases/gcc-8.4.0
+branch=releases/gcc-8
 out=$package-branch.diff
+repo=$package.git
 
 # use filterdiff, etc to exclude bad chunks from diff
 filter() {
-	# remove revno's for smaller diffs
-	# replace svn nonexistend with '0' date, so patch will know that file needs to be removed from disk
-	sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' | \
-	sed -e 's,^\([-+]\{3\} .*\t\)(nonexistent)$,\11970-01-01 01:00:00.000000000 +0100,'
+	cat
 }
 
-old=$svn/$tag
-new=$svn/$branch
-echo >&2 "Running diff: $old -> $new"
-LC_ALL=C svn diff -x --ignore-eol-style --force --old=$old --new=$new > $out.svn.tmp
-filter < $out.svn.tmp > $out.tmp
-rm -f $out.svn.tmp
+if [ ! -d $repo ]; then
+	git clone --bare $url -b $branch $repo
+fi
+
+cd $repo
+	git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
+	git log -p --reverse $tag..$branch ":(exclude)doc/doc-*" ":(exclude)test" ":(exclude).*" | filter > ../$out.tmp
+cd ..
 
 if cmp -s $out{,.tmp}; then
 	echo >&2 "No new diffs..."
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/aa42a555344981fea7bd884f23a8a1cbf37f4655