From 7154041b8979d7dd1ee4eafad7f94c24e921d79c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 22 Sep 2012 12:04:38 +0200 Subject: [PATCH] gcc: update to 4.7.2; use same patches for chroot-gcc. --- srcpkgs/chroot-gcc/template | 6 +++--- .../gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch | 17 ----------------- srcpkgs/gcc/template | 6 +++--- 3 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template index c21be4f02a..4b9459dafa 100644 --- a/srcpkgs/chroot-gcc/template +++ b/srcpkgs/chroot-gcc/template @@ -4,8 +4,8 @@ _majorver=4.7 _gmp_ver=5.0.3 _mpfr_ver=3.1.1 _mpc_ver=0.8.2 -version=${_majorver}.1 -revision=3 +version=${_majorver}.2 +revision=1 wrksrc="gcc-${version}" homepage="http://gcc.gnu.org" short_desc="The GNU C Compiler suite -- for xbps-src use" @@ -17,7 +17,7 @@ http://ftp.gnu.org/pub/gnu/gmp/gmp-${_gmp_ver}.tar.bz2 http://www.mpfr.org/mpfr-current/mpfr-${_mpfr_ver}.tar.bz2 http://www.multiprecision.org/mpc/download/mpc-${_mpc_ver}.tar.gz" checksum=" -16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f +8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084 dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3 7b66c3f13dc8385f08264c805853f3e1a8eedab8071d582f3e661971c9acd5fd ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7" diff --git a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch b/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index d577f10e6f..0000000000 --- a/srcpkgs/gcc/patches/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html - ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux . - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index ca4c268515..28fec57c2c 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,8 +1,8 @@ # Template build file for 'gcc' pkgname=gcc _majorver=4.7 -version=${_majorver}.1 -revision=4 +version=${_majorver}.2 +revision=1 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 " @@ -10,7 +10,7 @@ homepage="http://gcc.gnu.org" 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=16093f6fa01732adf378d97fe338f113c933bdf56da22bf87c76beff13da406f +checksum=8a9283d7010fb9fe5ece3ca507e0af5c19412626384f8a5e9434251ae100b084 long_desc=" The GNU C Compiler, with support for building C code.