Changed source to use upstream git master. Added git to makedepends. Updated pkgver= and pkgver(). Have to skip sha256sums of git source, and we no longer have to skip of the .sig file. Unlike a tarball, git clone will name the directory gcc, so we don't need to make a symlink called gcc.

2 files changed, 76 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79258269e4df..e8e8677eaf8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Wed Feb 15 10:50:09 UTC 2017
 pkgbase = gcc-git
-	pkgdesc = The GNU Compiler Collection (developmental version)
-	pkgver = 7.0.1.r152299.a718e363671
+	pkgdesc = The GNU Compiler Collection (git version)
+	pkgver = 9.0.0.r164803.d767b8cd9ed
 	pkgrel = 1
 	url = http://gcc.gnu.org
-	arch = i686
 	arch = x86_64
 	license = GPL
 	license = LGPL
@@ -13,70 +10,99 @@ pkgbase = gcc-git
 	license = custom
 	checkdepends = dejagnu
 	checkdepends = inetutils
-	makedepends = binutils>=2.26
+	makedepends = binutils
 	makedepends = libmpc
 	makedepends = gcc-ada
 	makedepends = doxygen
+	makedepends = lib32-glibc
+	makedepends = lib32-gcc-libs
+	makedepends = python
 	makedepends = git
 	options = !emptydirs
-	source = git+https://github.com/gcc-mirror/gcc
-	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
-	md5sums = SKIP
-	md5sums = 11436d6b205e516635b666090b94ab32
+	source = git+https://gcc.gnu.org/git/gcc.git
+	source = http://isl.gforge.inria.fr/isl-0.19.tar.bz2
+	source = c89
+	source = c99
+	validpgpkeys = F3691687D867B81B51CE07D9BBE43771487328A9
+	validpgpkeys = 86CFFCA918CF3AF47147588051E8B148A9999C34
+	validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7
+	validpgpkeys = 33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	sha256sums = SKIP
+	sha256sums = d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8
+	sha256sums = de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931
+	sha256sums = 2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a
 
 pkgname = gcc-git
-	pkgdesc = The GNU Compiler Collection - C and C++ frontends (developmental version)
+	pkgdesc = The GNU Compiler Collection - C and C++ frontends (git version)
 	groups = base-devel
-	depends = gcc-libs-git=7.0.1.r152299.a718e363671-1
-	depends = binutils>=2.26
+	depends = gcc-libs=9.0.0.r164803.d767b8cd9ed-1
+	depends = binutils>=2.28
 	depends = libmpc
-	provides = gcc=${_base_ver}
+	optdepends = lib32-gcc-libs: for generating code for 32-bit ABI
+	provides = gcc-multilib
+	provides = gcc
 	conflicts = gcc
+	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc-libs-git
-	pkgdesc = Runtime libraries shipped by GCC (developmental version)
+	pkgdesc = Runtime libraries shipped by GCC (git version)
 	groups = base
-	depends = glibc>=2.24
-	provides = gcc-libs=
+	depends = glibc>=2.27
+	provides = gcc-libs-multilib
+	provides = libgo.so
+	provides = libgfortran.so
+	provides = libubsan.so
+	provides = libasan.so
+	provides = libtsan.so
+	provides = liblsan.so
+	provides = gcc-libs
 	conflicts = gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-fortran-git
-	pkgdesc = Fortran front-end for GCC (developmental version)
-	depends = gcc-git=7.0.1.r152299.a718e363671-1
-	depends = libmpc
-	depends = zlib
-	provides = gcc-fortran=${_base_ver}
+	pkgdesc = Fortran front-end for GCC (git version)
+	depends = gcc=9.0.0.r164803.d767b8cd9ed-1
+	provides = gcc-fortran-multilib
+	provides = gcc-fortran
 	conflicts = gcc-fortran
-	options = !emptydirs
 
 pkgname = gcc-objc-git
-	pkgdesc = Objective-C front-end for GCC (developmental version)
-	depends = gcc-git=7.0.1.r152299.a718e363671-1
-	depends = libmpc
-	depends = zlib
-	provides = gcc-objc=${_base_ver}
+	pkgdesc = Objective-C front-end for GCC (git version)
+	depends = gcc=9.0.0.r164803.d767b8cd9ed-1
+	provides = gcc-objc-multilib
+	provides = gcc-objc
 	conflicts = gcc-objc
 
 pkgname = gcc-ada-git
-	pkgdesc = Ada front-end for GCC (GNAT) (developmental version)
-	depends = gcc-git=7.0.1.r152299.a718e363671-1
-	depends = libmpc
-	depends = zlib
-	provides = gcc-ada=${_base_ver}
+	pkgdesc = Ada front-end for GCC (GNAT) (git version)
+	depends = gcc=9.0.0.r164803.d767b8cd9ed-1
+	provides = gcc-ada-multilib
+	provides = gcc-ada
 	conflicts = gcc-ada
-	options = staticlibs
 	options = !emptydirs
+	options = staticlibs
 
 pkgname = gcc-go-git
-	pkgdesc = Go front-end for GCC (developmental version)
-	depends = gcc-git=7.0.1.r152299.a718e363671-1
-	depends = libmpc
-	depends = zlib
-	provides = gcc-go=${_base_ver}
+	pkgdesc = Go front-end for GCC (git version)
+	depends = gcc=9.0.0.r164803.d767b8cd9ed-1
+	provides = go=1.10.1
+	provides = gcc-go-multilib
+	provides = gcc-go
 	conflicts = go
 	conflicts = gcc-go
+
+pkgname = lib32-gcc-libs-git
+	pkgdesc = 32-bit runtime libraries shipped by GCC (git version)
+	groups = multilib-devel
+	depends = lib32-glibc>=2.27
+	provides = libgo.so
+	provides = libgfortran.so
+	provides = libubsan.so
+	provides = libasan.so
+	provides = lib32-gcc-libs
+	conflicts = lib32-gcc-libs
 	options = !emptydirs
+	options = !strip
 
diff --git a/PKGBUILD b/PKGBUILD
index 946448abea3c..d490a99cb888 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-git)
-pkgver=8.2.1+20180831
+pkgver=9.0.0.r164803.d767b8cd9ed
 _majorver=${pkgver:0:1}
 _islver=0.19
 pkgrel=1
@@ -19,19 +19,18 @@ pkgdesc='The GNU Compiler Collection (git version)'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url='http://gcc.gnu.org'
-makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python)
+makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
 #source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
-source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
+source=(git+https://gcc.gnu.org/git/gcc.git
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
         c89 c99)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
               13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
               33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('725ec907fd7463568ec0c097802824b978a679523a2e3374bdc2e3d265cd2b6c'
-            'SKIP'
+sha256sums=('SKIP'
             'd59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
             '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
@@ -42,8 +41,14 @@ _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
 
 # snapshot() is only used by core's maintainers, so removing it here
 
+pkgver() {
+  cd gcc
+  echo $(cat gcc/BASE-VER).r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+}
+
 prepare() {
-  [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
+  #unlike a tarball, git clone will name the directory gcc
+  #[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
   cd gcc
 
   # link isl for in-tree build