gcc libre-testing fixes

1 files changed, 13 insertions, 12 deletions

diff --git a/libre-testing/gcc/PKGBUILD b/libre-testing/gcc/PKGBUILD
index 7ff840891..98006c865 100644
--- a/libre-testing/gcc/PKGBUILD
+++ b/libre-testing/gcc/PKGBUILD
@@ -6,7 +6,8 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=6.2.0
+pkgver=6.3.1
+gccver=6.3.0
 _pkgver=6
 _islver=0.16
 pkgrel=1.90.parabola1
@@ -17,7 +18,7 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.27' 'libmpc' 'gcc-ada' 'doxygen' 'git')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
-source=("https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2"{,.sig}
+source=("https://ftp.gnu.org/gnu/gcc/gcc-$gccver/gcc-$gccver.tar.bz2"{,.sig}
         "http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2")
 validpgpkeys=('13975A70E63C361C73AE69EF6EEB81F8981C74C7') # Richard Guenther <richard.guenther@gmail.com>"
 sha512sums=('1e8b826a3d44b9d5899309894e20c03abeb352bf3d273b8ad63af814c0ee2911f1a83ce1cd4cdd2d1cb0b3e3c34e9b7ae1b2ab83dfc649ee817ab05247c76198'
@@ -31,11 +32,11 @@ if [[ "${CHOST}" == 'x86_64-unknown-linux-gnu' ]]; then
   _CHOST='x86_64-pc-linux-gnu'
 fi
 
-_libdir="usr/lib/gcc/$_CHOST/$pkgver"
+_libdir="usr/lib/gcc/$_CHOST/$gccver"
 
 
 prepare() {
-  cd ${srcdir}/gcc-$pkgver
+  cd ${srcdir}/gcc-$gccver
 
   # link isl for in-tree build
   ln -s ../isl-${_islver} isl
@@ -60,7 +61,7 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  ${srcdir}/gcc-$pkgver/configure --prefix=/usr \
+  ${srcdir}/gcc-$gccver/configure --prefix=/usr \
       --libdir=/usr/lib \
       --libexecdir=/usr/lib \
       --mandir=/usr/share/man \
@@ -104,7 +105,7 @@ check() {
 
   # do not abort on error as some are "expected"
   make -k check || true
-  ${srcdir}/gcc-$pkgver/contrib/test_summary
+  ${srcdir}/gcc-$gccver/contrib/test_summary
 }
 
 
@@ -150,14 +151,14 @@ package_gcc-libs()
   done
 
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-$pkgver/COPYING.RUNTIME \
+  install -Dm644 ${srcdir}/gcc-$gccver/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
 }
 
 package_gcc()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.26' 'libmpc')
+  depends=("gcc-libs=$gccver-$pkgrel" 'binutils>=2.26' 'libmpc')
   groups=('base-devel')
   options=('staticlibs')
 
@@ -255,7 +256,7 @@ EOF
 package_gcc-fortran()
 {
   pkgdesc="Fortran front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
+  depends=("gcc=$gccver-$pkgrel")
   options=('!emptydirs')
 
   cd ${srcdir}/gcc-build
@@ -275,7 +276,7 @@ package_gcc-fortran()
 package_gcc-objc()
 {
   pkgdesc="Objective-C front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
+  depends=("gcc=$gccver-$pkgrel")
 
   cd ${srcdir}/gcc-build
   make DESTDIR=$pkgdir -C $_CHOST/libobjc install-headers
@@ -290,7 +291,7 @@ package_gcc-objc()
 package_gcc-ada()
 {
   pkgdesc="Ada front-end for GCC (GNAT)"
-  depends=("gcc=$pkgver-$pkgrel")
+  depends=("gcc=$gccver-$pkgrel")
   options=('staticlibs' '!emptydirs')
 
   cd ${srcdir}/gcc-build/gcc
@@ -313,7 +314,7 @@ package_gcc-ada()
 package_gcc-go()
 {
   pkgdesc="Go front-end for GCC"
-  depends=("gcc=$pkgver-$pkgrel")
+  depends=("gcc=$gccver-$pkgrel")
   conflicts=('go')
   options=('!emptydirs')