[arch-commits] Commit in gcc/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Wednesday, December 27, 2017 @ 19:25:54
  Author: bpiotrowski
Revision: 313707

7.2.1+20171224-1: sync with gcc-7-branch

Also start building and using our own source tarball as upstream's svntogit
falls behind sometimes.

Modified:
  gcc/trunk/PKGBUILD

----------+
 PKGBUILD |   31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-27 16:42:43 UTC (rev 313706)
+++ PKGBUILD	2017-12-27 19:25:54 UTC (rev 313707)
@@ -6,31 +6,30 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=(gcc gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go lib32-gcc-libs)
-pkgver=7.2.1
-_pkgver=${pkgver:0:1}
+pkgver=7.2.1+20171224
+_majorver=${pkgver:0:1}
 _islver=0.18
-pkgrel=3
+pkgrel=1
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url='http://gcc.gnu.org'
-makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc)
+makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-_commit=ddc276644272d8beda88c0daa17624f6675448ad
-#source=(git+https://gcc.gnu.org/git/gcc.git#commit=${_commit}
-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)
-sha256sums=('dd2b0526c3bdfe32aab96965965be5ffc411a0d2301a5319a0c59426f847c744'
+validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9) # bpiotrowski at archlinux.org
+sha256sums=('394c416a35dc608e5c9ea5ca902c5b08b51fcbc6b3b39ece05b8eea67033b4a8'
+            'SKIP'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
             '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
 
-_libdir=usr/lib/gcc/$CHOST/$pkgver
+_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
 
 prepare() {
-  ln -s gcc-${_commit} gcc
   cd gcc
 
   # link isl for in-tree build
@@ -288,15 +287,15 @@
   ln -s gcc "$pkgdir/usr/bin/gnatgcc"
 
   # insist on dynamic linking, but keep static libraries because gnatmake complains
-  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so "$pkgdir/usr/lib"
-  ln -s libgnarl-${_pkgver}.so "$pkgdir/usr/lib/libgnarl.so"
-  ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib/libgnat.so"
+  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib"
+  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib/libgnarl.so"
+  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib/libgnat.so"
   rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
 
   install -d "$pkgdir/usr/lib32/"
-  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_pkgver}.so "$pkgdir/usr/lib32"
-  ln -s libgnarl-${_pkgver}.so "$pkgdir/usr/lib32/libgnarl.so"
-  ln -s libgnat-${_pkgver}.so "$pkgdir/usr/lib32/libgnat.so"
+  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib32"
+  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib32/libgnarl.so"
+  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib32/libgnat.so"
   rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
 
   # Install Runtime Library Exception