From 12254a5969fc0f0a726748ef958df163b5130dbf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 28 Oct 2011 07:21:58 +0200
Subject: [PATCH] gcc: update to 4.6.2.

---
 srcpkgs/gcc/gcc-c++.template           | 1 -
 srcpkgs/gcc/gcc-fortran.template       | 1 -
 srcpkgs/gcc/gcc-go.template            | 1 -
 srcpkgs/gcc/gcc-objc++.template        | 1 -
 srcpkgs/gcc/gcc-objc.template          | 1 -
 srcpkgs/gcc/libgfortran-devel.template | 1 -
 srcpkgs/gcc/libssp-devel.template      | 1 -
 srcpkgs/gcc/libstdc++-devel.template   | 1 -
 srcpkgs/gcc/template                   | 9 ++++-----
 9 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 8693592a842..ba72caf7d4a 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
-revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index 9f06d989ce1..10455a226ea 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran frontend."
 
-revision=2
 
 Add_dependency run libgcc	">=$version"
 Add_dependency run glibc
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index c703a797418..10f232b6f08 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the GCC Go frontend."
 
-revision=2
 
 Add_dependency run libgcc	">=$version"
 Add_dependency run glibc
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 3964ffd3d17..19eb4d46837 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
-revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index c39f13ade3f..a6ca89ef63d 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
-revision=2
 
 Add_dependency run glibc
 Add_dependency run zlib
diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template
index 2be8a60e1ed..7ac0e2b2909 100644
--- a/srcpkgs/gcc/libgfortran-devel.template
+++ b/srcpkgs/gcc/libgfortran-devel.template
@@ -5,7 +5,6 @@ long_desc="${long_desc}
 
  This package contains the GCC Fortran headers and static libraries."
 
-revision=1
 
 Add_dependency run libgfortran ">=${version}"
 
diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
index 8b6f10a8f93..18558073560 100644
--- a/srcpkgs/gcc/libssp-devel.template
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains the Stack Smashing Protection development
  files provided by GCC."
 
-revision=3
 
 Add_dependency run glibc-devel
 Add_dependency run libssp
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index df3330bf4fd..020b0068a9f 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -6,7 +6,6 @@ long_desc="${long_desc}
  This package contains GCC Header files and libraries for
  C++ development."
 
-revision=2
 
 Add_dependency run libstdc++	">=$version"
 
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 6e1a7097c76..5dcedbadb84 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -3,14 +3,13 @@
 # NOTE: don't forget to sync with gcc-multilib when this package is updated.
 pkgname=gcc
 _majorver=4.6
-version=${_majorver}.1
-revision=1
+version=${_majorver}.2
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
-checksum=8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59
+checksum=60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
 long_desc="
  The GNU C Compiler, with support for building C code.
  
@@ -76,7 +75,7 @@ do_configure()
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-	CONFIG_SHELL=/bin/bash ./configure ${CONFIGURE_SHARED_ARGS} --libexecdir=/usr/lib \
+	CONFIG_SHELL=/bin/bash ./configure --libexecdir=/usr/lib \
 		--enable-clocale=gnu --disable-bootstrap --libdir=/usr/lib \
 		--enable-threads=posix --enable-__cxa_atexit --disable-multilib \
 		--enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \
@@ -85,7 +84,7 @@ do_configure()
 		--with-ppl=${XBPS_MASTERDIR}/usr --with-cloog=${XBPS_MASTERDIR}/usr \
 		--enable-lto --with-libelf=${XBPS_MASTERDIR}/usr \
 		--enable-linker-build-id --enable-gnu-unique-object \
-		--enable-checking=release
+		--enable-checking=release ${CONFIGURE_SHARED_ARGS}
 
 	[ -z "$BOOTSTRAP_PKG_REBUILD" ] || export PATH=$SAVEDPATH
 }