summaryrefslogtreecommitdiff
path: root/core/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'core/gcc')
-rw-r--r--core/gcc/PKGBUILD15
-rw-r--r--core/gcc/gcc-4.7.1-libgo-mksysinfo.patch15
2 files changed, 25 insertions, 5 deletions
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 0b6c541a3..0f052815b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162898 2012-07-03 10:44:15Z allan $
+# $Id: PKGBUILD 163010 2012-07-05 13:48:46Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,7 +10,7 @@ else
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
fi
pkgver=4.7.1
-pkgrel=3
+pkgrel=4
#_snapshot=4.7-20120505
_libstdcppmanver=20120605 # Note: check source directory name when updating this
pkgdesc="The GNU Compiler Collection"
@@ -30,13 +30,15 @@ source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
gcc_pure64.patch
gcc_mips64el_lib.patch
gcc-4.7.1-libada-pic.patch
- gcc-4.7.1-libgo-write.patch)
+ gcc-4.7.1-libgo-write.patch
+ gcc-4.7.1-libgo-mksysinfo.patch)
md5sums=('933e6f15f51c031060af64a9e14149ff'
'767c62f9a047c4434f2345decf1d0819'
'ced48436c1b3c981d721a829f1094de1'
'474b8f5a7dee6ddd96b95a7240bfb961'
'2acbc9d35cc9d72329dc71d6b1f162ef'
- 'df82dd175ac566c8a6d46b11ac21f14c')
+ 'df82dd175ac566c8a6d46b11ac21f14c'
+ '8e847244dba042d0aa3297713edaf70c')
if [ -n "${_snapshot}" ]; then
_basedir="${srcdir}/gcc-${_snapshot}"
@@ -65,6 +67,9 @@ build() {
# bug to file...
patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
+ # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
+ patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch
+
echo ${pkgver} > gcc/BASE-VER
cd ${srcdir}
@@ -129,7 +134,7 @@ package_gcc-libs()
{
pkgdesc="Runtime libraries shipped by GCC"
groups=('base')
- depends=('glibc>=2.15')
+ depends=('glibc>=2.16')
install=gcc-libs.install
cd gcc-build
diff --git a/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
new file mode 100644
index 000000000..427efe8a6
--- /dev/null
+++ b/core/gcc/gcc-4.7.1-libgo-mksysinfo.patch
@@ -0,0 +1,15 @@
+--- 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 <bits/resource.h>.
+ 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/'`