Sat May 3 03:56:22 UTC 2014

1 files changed, 19 insertions, 25 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index ffb33ea06..fa27b2680 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 205614 2014-02-10 03:07:49Z allan $
+# $Id: PKGBUILD 211960 2014-05-02 08:39:39Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.8.2
-_pkgver=4.8
-pkgrel=8
-_snapshot=4.8-20140206
+pkgver=4.9.0
+_pkgver=4.9
+pkgrel=1
+#_snapshot=4.9.0-RC-20140411
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -16,13 +16,11 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-        gcc-4.8-filename-output.patch
-        gcc-4.8-lambda-ICE.patch)
-md5sums=('9d35549404a2326540fb88301ebd1977'
-         '40cb437805e2f7a006aa0d0c3098ab0f'
-         '6eb6e080dbf7bc6825f53a0aaa6c4ef9')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+        gcc-4.8-filename-output.patch)
+md5sums=('9709b49ae0e904cbb0a6a1b62853b556'
+         '40cb437805e2f7a006aa0d0c3098ab0f')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -48,13 +46,6 @@ prepare() {
 
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
   patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch
-  
-  # http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279
-  patch -p1 -i ${srcdir}/gcc-4.8-lambda-ICE.patch
-
-  # installing libiberty headers is broken
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56780#c6
-  sed -i 's#@target_header_dir@#libiberty#' libiberty/Makefile.in
 
   mkdir ${srcdir}/gcc-build
 }
@@ -113,14 +104,15 @@ package_gcc-libs()
   make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
   rm ${pkgdir}/${_libdir}/libgcc_eh.a
   
-  for lib in libmudflap \
+  for lib in libatomic \
+             libcilkrts \
+             libgfortran \
              libgomp \
              libitm \
-             libatomic \
-             libstdc++-v3/src \
              libquadmath \
-             libgfortran \
-             libsanitizer/asan; do
+             libsanitizer/{a,l,ub}san \
+             libstdc++-v3/src \
+             libvtv; do
     make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
 
@@ -175,11 +167,13 @@ package_gcc()
   make -C gcc DESTDIR=${pkgdir} install-mkheaders
   make -C lto-plugin DESTDIR=${pkgdir} install
 
+  make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+    install-nodist_cilkincludeHEADERS
   make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
     install-nodist_libsubincludeHEADERS
   make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
-  make -C $CHOST/libmudflap DESTDIR=${pkgdir} install-nobase_libsubincludeHEADERS
   make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+  make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
   make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
 
   make -C libiberty DESTDIR=${pkgdir} install