gcc: glibc-2.17 rebuild.

srcpkgs/gcc/gcc-c++-multilib.template

@@ -1,16 +1,10 @@
 # Template file for 'gcc-c++-multilib'.
 #
-depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} libstdc++32-devel>=${_majorver}"
+depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver}
+ libstdc++32-devel>=${_majorver}"
 short_desc="GCC C++ compiler (multilib files)"
-long_desc="
- This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"
 

srcpkgs/gcc/gcc-c++.template

@@ -2,9 +2,6 @@
 #
 depends="gcc>=${_majorver} libstdc++-devel>=${_majorver}"
 short_desc="GCC C++ support"
-long_desc="${long_desc}
-
- This package contains GCC C++ support."
 
 do_install() {
 	for f in g++ c++ ${_triplet}-g++ ${_triplet}-c++; do

srcpkgs/gcc/gcc-fortran.template

@@ -2,11 +2,6 @@
 #
 depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}"
 short_desc="GCC Fortran compiler frontend"
-long_desc="${long_desc}
-
- This package contains the GCC Fortran frontend."
-
-
 
 do_install() {
 	for f in gfortran ${_triplet}-gfortran; do

srcpkgs/gcc/gcc-go.template

@@ -2,14 +2,8 @@
 #
 depends="gcc>=${_majorver} libgo-devel>=${_majorver}"
 short_desc="GCC Go compiler frontend"
-long_desc="${long_desc}
 
- This package contains the GCC Go frontend."
+do_install() {
-
-
-
-do_install()
-{
 	for f in gccgo ${_triplet}-gccgo; do
 		vmove usr/bin/${f} usr/bin
 	done

srcpkgs/gcc/gcc-multilib.template

@@ -1,16 +1,10 @@
 # Template file for 'gcc-c-multilib'.
 #
-depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver} libitm32>=${_majorver} zlib32 glibc32-devel"
+depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver}
+ libitm32>=${_majorver} zlib32 glibc32-devel"
 short_desc="GCC C compiler (multilib files)"
-long_desc="
- This is the GNU C compiler, a fairly portable optimizing compiler for C.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	local libmddir="usr/lib/gcc/${_triplet}/${_majorver}"
 

srcpkgs/gcc/gcc-objc++.template

@@ -2,9 +2,6 @@
 #
 depends="gcc-c++>=${_majorver} gcc-objc>=${_majorver}"
 short_desc="GCC Objective-C++ support"
-long_desc="${long_desc}
-
- This package contains GCC Objective-C++ support."
 
 do_install() {
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus \

srcpkgs/gcc/gcc-objc-multilib.template

@@ -2,16 +2,8 @@
 #
 depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc32>=${_majorver}"
 short_desc="The GNU Objective-C compiler (multilib files)"
-long_desc="
- This is the GNU Objective-C compiler, which compiles Objective-C on
- platforms supported by the GCC compiler.
-
- On architectures with multilib support, the package contains files and
- dependencies for the non-default multilib architecture(s)."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	local libmddir="/usr/lib/gcc/${_triplet}/${_majorver}"
 

srcpkgs/gcc/gcc-objc.template

@@ -2,9 +2,6 @@
 #
 depends="gcc>=${_majorver} libobjc>=${_majorver}"
 short_desc="GCC Objective-C support"
-long_desc="${long_desc}
-
- This package contains GCC Objective-C support."
 
 do_install() {
 	vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc \

srcpkgs/gcc/libgcc.template

@@ -1,10 +1,6 @@
 # Template file for 'gcc-libgcc'.
 #
 short_desc="GCC version ${version} shared library support"
-long_desc="${long_desc}
-
- This package contains the GCC shared library."
-
 noverifyrdeps=yes
 
 do_install()

srcpkgs/gcc/libgcc32.template

@@ -1,10 +1,6 @@
 # Template file for 'libgcc32'.
 #
 short_desc="GCC version ${version} shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC shared library for x86_64 systems."
-
 noverifyrdeps=yes
 
 do_install() {

srcpkgs/gcc/libgfortran-devel.template

@@ -2,11 +2,6 @@
 #
 depends="libgfortran>=${_majorver}"
 short_desc="GCC Fortran library ${version} - development files"
-long_desc="${long_desc}
-
- This package contains the GCC Fortran headers and static libraries."
-
-
 
 do_install() {
 	# create version -> major symlink

srcpkgs/gcc/libgfortran.template

@@ -1,10 +1,6 @@
 # Template file for 'libgfortran'.
 #
 short_desc="GCC Fortran library ${version} shared library support"
-long_desc="${long_desc}
-
- This package contains the GCC Fortran shared library."
-
 
 do_install() {
 	vmove "usr/lib/libgfortran.so*" usr/lib

srcpkgs/gcc/libgo-devel.template

@@ -2,11 +2,6 @@
 #
 depends="libgo>=${_majorver}"
 short_desc="GCC Go library ${version} shared library support - development files"
-long_desc="${long_desc}
-
- This package contains the GCC Go headers and static libraries."
-
-
 
 do_install() {
 	vmove usr/lib/libgo.a usr/lib

srcpkgs/gcc/libgo.template

@@ -1,9 +1,6 @@
 # Template file for 'libgo'.
 #
 short_desc="Go library ${version} shared library support"
-long_desc="${long_desc}
-
- This package contains the GO shared library."
 
 do_install() {
 	vmove "usr/lib/libgo.so*" usr/lib

srcpkgs/gcc/libgomp.template

@@ -1,11 +1,6 @@
 # Template file for 'libgomp'.
 #
 short_desc="GCC OpenMP v3.0 shared support library"
-long_desc="${long_desc}
-
- This package contains GCC shared support library which is needed
- for OpenMP v3.0 support."
-
 replaces="gcc>=4.6.3<4.6.3_3"
 
 do_install() {

srcpkgs/gcc/libgomp32.template

@@ -2,14 +2,8 @@
 #
 depends="libgcc32 glibc32"
 short_desc="GCC OpenMP v3.0 shared support library (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC shared support library which is needed
- for OpenMP v3.0 support."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libgomp.*" usr/lib32
 }

srcpkgs/gcc/libitm.template

@@ -1,10 +1,6 @@
 # Template file for 'libitm'.
 #
 short_desc="GCC Transactional Memory support library"
-long_desc="${long_desc}
-
- This package contains GCC support for Transactional Memory, which is
- used when C code is built with -fgnu-tm flag."
 
 do_install() {
 	vmove "usr/lib/libitm.*" usr/lib

srcpkgs/gcc/libitm32.template

@@ -2,14 +2,8 @@
 #
 depends="libgcc32"
 short_desc="GCC Transactional Memory support library (32bit)"
-long_desc="${long_desc}
-
- This package contains GCC support for Transactional Memory, which is
- used when C code is built with -fgnu-tm flag."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libitm*" usr/lib32
 }

srcpkgs/gcc/libmudflap-devel.template

@@ -2,12 +2,6 @@
 #
 depends="libmudflap>=${_majorver}"
 short_desc="GCC mudflap shared support library (development files)"
-long_desc="${long_desc}
-
- This package contains GCC mudflap headers and static libraries for
- building mudflap-instrumented programs."
-
-
 
 do_install() {
 	vmove "usr/lib/libmudflap*.a" usr/lib

srcpkgs/gcc/libmudflap.template

@@ -1,11 +1,6 @@
 # Template file for 'gcc-libmudflap'.
 #
 short_desc="GCC mudflap shared support library"
-long_desc="${long_desc}
-
- This package contains GCC shared support library which is needed
- for mudflap support."
-
 
 do_install() {
 	vmove "usr/lib/libmudflap*.so*" usr/lib

srcpkgs/gcc/libmudflap32-devel.template

@@ -2,12 +2,6 @@
 #
 depends="gcc-multilib glibc32-devel libmudflap32"
 short_desc="GCC 32bit mudflap support libraries (development files)"
-long_desc="
- The libmudflap libraries are used by GCC for instrumenting pointer
- and array dereferencing operations.
-
- This package contains the headers and the static libraries." 
-
 
 do_install() {
 	vmove "usr/lib32/libmudflap*.a" usr/lib32

srcpkgs/gcc/libmudflap32.template

@@ -2,13 +2,8 @@
 #
 depends="gcc-multilib glibc32"
 short_desc="GCC mudflap shared support libraries (32bit)"
-long_desc="
- The libmudflap libraries are used by GCC for instrumenting pointer
- and array dereferencing operations."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libmudflap*.so*" usr/lib32
 }

srcpkgs/gcc/libobjc-devel.template

@@ -2,12 +2,6 @@
 #
 depends="libobjc>=${_majorver}"
 short_desc="GCC Objective-C shared library support (development files)"
-long_desc="${long_desc}
-
- This package contains GCC Objective-C headers and static libs, to
- build Objective-C programs."
-
-
 
 do_install() {
 	vmove "usr/lib/libobjc.*a" usr/lib

srcpkgs/gcc/libobjc.template

@@ -1,10 +1,6 @@
 # Template file for 'libobjc'.
 #
 short_desc="GCC Objective-C shared library support"
-long_desc="${long_desc}
-
- This package contains GCC Objective-C shared support library which is needed
- to run Objective-C dynamically linked programs."
 
 do_install() {
 	vmove "usr/lib/libobjc.so*" usr/lib

srcpkgs/gcc/libobjc32.template

@@ -2,14 +2,8 @@
 #
 depends="libgcc32 glibc32"
 short_desc="GCC Objective-C shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit GCC Objective-C shared support library
- which is needed to run Objective-C dynamically linked programs."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libobjc.so*" usr/lib32
 }

srcpkgs/gcc/libquadmath-devel.template

@@ -2,12 +2,6 @@
 #
 depends="libquadmath>=${_majorver}"
 short_desc="GCC quadmath shared support library (development files)"
-long_desc="${long_desc}
-
- This package contains GCC quadmath headers and static libraries for
- building mudflap-instrumented programs."
-
-
 
 do_install() {
 	vmove "usr/lib/libquadmath*.a" usr/lib

srcpkgs/gcc/libquadmath.template

@@ -1,10 +1,6 @@
 # Template file for 'libquadmath'
 #
 short_desc="GCC quad match ${version} shared library support"
-long_desc="${long_desc}
-
- This package contains the GCC quadmath shared library."
-
 
 do_install() {
 	vmove "usr/lib/libquadmath.so*" usr/lib

srcpkgs/gcc/libssp.template

@@ -1,11 +1,6 @@
 # Template file for 'libssp'.
 #
 short_desc="GCC SSP shared library support"
-long_desc="${long_desc}
-
- This package contains the Stack Smashing Protection shared library
- provided by GCC."
-
 
 do_install() {
 	vmove "usr/lib/libssp.so*" usr/lib

srcpkgs/gcc/libssp32.template

@@ -2,14 +2,8 @@
 #
 depends="glibc32"
 short_desc="GCC SSP shared library support (32bit)"
-long_desc="${long_desc}
-
- This package contains the 32bit Stack Smashing Protection shared library
- provided by GCC."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libssp.so*" usr/lib32
 }

srcpkgs/gcc/libstdc++-devel.template

@@ -2,12 +2,6 @@
 #
 depends="libstdc++>=${_majorver}"
 short_desc="GCC Standard C++ Library (development files)"
-long_desc="${long_desc}
-
- This package contains GCC Header files and libraries for
- C++ development."
-
-
 
 do_install() {
 	vmove "usr/lib/libstdc++.*a" usr/lib

srcpkgs/gcc/libstdc++.template

@@ -1,10 +1,6 @@
 # Template file for 'gcc-libstdc++'.
 #
 short_desc="GCC Standard C++ Library"
-long_desc="${long_desc}
-
- This package contains a rewritten standard compliant GCC Standard
- C++ library."
 
 do_install() {
 	vmove "usr/lib/libstdc++.so*" usr/lib

srcpkgs/gcc/libstdc++32-devel.template

@@ -2,14 +2,8 @@
 #
 depends="libstdc++-devel libstdc++32"
 short_desc="GCC Standard C++ Library (32bit) development files"
-long_desc="${long_desc}
-
- This package contains a rewritten 32bit standard compliant GCC Standard
- C++ development files and headers for x86_64 systems."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove usr/include/c++/${_majorver}/${_triplet}/32 \
 		usr/include/c++/${_majorver}/${_triplet}

srcpkgs/gcc/libstdc++32.template

@@ -2,14 +2,8 @@
 #
 depends="libgcc32 glibc32 libstdc++"
 short_desc="GCC Standard C++ Library (32bit)"
-long_desc="${long_desc}
-
- This package contains a rewritten standard compliant GCC Standard
- C++ library 32bit for x86_64 systems."
-
 noverifyrdeps=yes
 
-
 do_install() {
 	vmove "usr/lib32/libstdc++.so*" usr/lib32
 }

srcpkgs/gcc/template

@@ -2,8 +2,9 @@
 pkgname=gcc
 _majorver=4.7
 version=${_majorver}.2
-revision=1
+revision=2
-makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel ppl-devel>=1.0 cloog-devel"
+makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel
+ ppl-devel>=1.0 cloog-devel"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -11,19 +12,12 @@ license="GFDL-1.2, GPL-3, LGPL-2.1"
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
 checksum=8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084
-long_desc="
- The GNU C Compiler, with support for building C code.
- 
- For C++ install gcc-c++, for ObjectiveC install gcc-objc,
- for ObjectiveC++ install gcc-objc++, for Go install gcc-go,
- for Fortran install gcc-fortran."
 
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	# Required stuff for multilib packages.
 	makedepends="${makedepends} glibc32-devel"
-	subpackages="gcc-multilib gcc-c++-multilib"
+	subpackages="gcc-multilib gcc-c++-multilib gcc-objc-multilib libgcc32"
-	subpackages="${subpackages} gcc-objc-multilib libgcc32 libgomp32"
+	subpackages="${subpackages} libgomp32 libmudflap32-devel libmudflap32"
-	subpackages="${subpackages} libmudflap32-devel libmudflap32"
 	subpackages="${subpackages} libobjc32 libssp32 libstdc++32-devel"
 	subpackages="${subpackages} libstdc++32 libitm32"
 
@@ -32,11 +26,13 @@ else
 	_triplet="${XBPS_MACHINE}-pc-linux-gnu"
 fi
 
-subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++ libstdc++-devel libgomp"
+disable_debug=yes
-subpackages="${subpackages} libquadmath libquadmath-devel libgo-devel libgomp-devel libitm"
+
-subpackages="${subpackages} libmudflap libmudflap-devel libobjc libobjc-devel"
+subpackages="${subpackages} libgcc libgo libssp libssp-devel libstdc++
-subpackages="${subpackages} libgfortran libgfortran-devel gcc-fortran"
+ libstdc++-devel libgomp libquadmath libquadmath-devel libgo-devel
-subpackages="${subpackages} gcc-c++ gcc-objc gcc-objc++ gcc-go"
+ libgomp-devel libitm libmudflap libmudflap-devel libobjc
+ libobjc-devel  libgfortran libgfortran-devel gcc-fortran gcc-c++
+ gcc-objc gcc-objc++ gcc-go"
 
 do_configure() {
 	# As specified in the LFS book, disable installing libiberty.