From 1b9f6dc846379470b620b5dbb9d4d7acd1de148c Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 28 Jan 2013 00:05:59 -0800
Subject: Mon Jan 28 00:05:59 PST 2013

---
 core/gcc/PKGBUILD | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'core/gcc')

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index e86b2a22e..05e667624 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173936 2012-12-28 13:10:57Z allan $
+# $Id: PKGBUILD 176037 2013-01-26 23:37:17Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
 pkgver=4.7.2
-pkgrel=3
+pkgrel=4
 #_snapshot=4.7-20120721
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -17,12 +17,8 @@ checkdepends=('dejagnu')
 options=('!libtool' '!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_pure64.patch
-	gcc-4.7.1-libada-pic.patch
 	gcc-4.7.1-libgo-write.patch)
 md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'ced48436c1b3c981d721a829f1094de1'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
          'df82dd175ac566c8a6d46b11ac21f14c')
 
 
@@ -41,18 +37,19 @@ build() {
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
+  # Arch Linux installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
   patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
 
   echo ${pkgver} > gcc/BASE-VER
 
+  # using -pipe causes spurious test-suite failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+  CFLAGS=${CFLAGS/-pipe/}
+  CXXFLAGS=${CXXFLAGS/-pipe/}
+
   cd ${srcdir}
   mkdir gcc-build && cd gcc-build
 
-- 
cgit v1.2.3-54-g00ecf