From 0d67b1b21ce2aafe8d05b2f30b1ba020e35e18cc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 6 Jan 2018 20:21:01 +0000
Subject: [PATCH] core/gcc to 7.2.1+20171224-1

---
 core/gcc/PKGBUILD | 51 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index aea4c2240..1ff58ffc1 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -6,7 +6,6 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - use GitHub gcc mirror commit archive (order of magnitude size difference)
 #  - removed ada packages
 #  - removed gnat (ada stuff) from gcc packaging
 #  - disabled make check, too much stress, kills plugs :(
@@ -17,32 +16,52 @@
 noautobuild=1
 
 pkgname=(gcc gcc-libs gcc-fortran gcc-objc gcc-go)
-pkgver=7.2.1
-_pkgver=${pkgver:0:1}
+pkgver=7.2.1+20171224
+_majorver=${pkgver:0:1}
 _islver=0.18
-pkgrel=2
+pkgrel=1
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url='http://gcc.gnu.org'
-makedepends=(binutils libmpc doxygen git)
+makedepends=(binutils libmpc doxygen)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs !distcc)
-_commit=bce1ab0478f96724828df51ccfd43197d917c572
-source=(https://github.com/gcc-mirror/gcc/archive/${_commit}.tar.gz
+source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
         c89 c99
         0001-ARMv5-disable-LDRD-STRD.patch)
-md5sums=('63bfa5606932a8c84e5eb8883a9eba4f'
-         '11436d6b205e516635b666090b94ab32'
-         '3d333df77302ed89e06a4a8539943b7d'
-         'da96f545b863e57c6ab2598c1ea9a740'
-         'a5165d78c473b487637d293a49e01740')
+validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9) # bpiotrowski@archlinux.org
+sha256sums=('394c416a35dc608e5c9ea5ca902c5b08b51fcbc6b3b39ece05b8eea67033b4a8'
+            'SKIP'
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+            'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
+            '31e24baa9eee826d7d77dbcf8f1a6a44c92f771e52d21677acb8d76fac7ae204')
 
-_libdir=usr/lib/gcc/$CHOST/$pkgver
+_svnrev=255990
+_svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
+_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
+
+snapshot() {
+  svn export -r${_svnrev} ${_svnurl} gcc-r${_svnrev}
+
+  local datestamp basever _pkgver
+  basever=$(< gcc-r${_svnrev}/gcc/BASE-VER)
+  datestamp=$(< gcc-r${_svnrev}/gcc/DATESTAMP)
+  _pkgver=${basever}-${datestamp}
+
+  mv gcc-r${_svnrev} gcc-${_pkgver}
+  tar cf - gcc-${_pkgver} | xz > gcc-${_pkgver}.tar.xz
+  gpg -b gcc-${_pkgver}.tar.xz
+  scp gcc-${_pkgver}.tar.xz{,.sig} sources.archlinux.org:/srv/ftp/other/gcc/
+
+  echo
+  echo "pkgver=${_pkgver/-/+}"
+}
 
 prepare() {
-  mv gcc-${_commit}* gcc
+  ln -s gcc-${_commit} gcc
   cd gcc
 
   # link isl for in-tree build
@@ -119,10 +138,6 @@ build() {
 check() {
   cd gcc-build
 
-  # increase stack size to prevent test failures
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
-  ulimit -s 32768
-
   # do not abort on error as some are "expected"
   make -k check || true
   "$srcdir/gcc/contrib/test_summary"