Sat Sep 10 23:14:36 UTC 2011

1 files changed, 22 insertions, 11 deletions

diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD
index ad9e5c374..3de174843 100644
--- a/extra/libstdc++5/PKGBUILD
+++ b/extra/libstdc++5/PKGBUILD
@@ -1,38 +1,49 @@
-# $Id: PKGBUILD 35574 2009-04-14 04:10:12Z eric $
+# $Id: PKGBUILD 137600 2011-09-10 01:24:58Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libstdc++5
 pkgver=3.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="GNU Standard C++ library version 3"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://gcc.gnu.org"
 license=('GPL' 'LGPL')
 depends=('gcc-libs')
 makedepends=('binutils' 'gcc')
 options=('!libtool' '!makeflags')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch)
-md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \
-         088e0807e677010cafe4e590e8711be1)
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
+        'gcc-3.4.3-no_multilib_amd64.patch')
+md5sums=('18c52e6fb8966b7700665dca289d077f'
+         '6b3d00b8d079805be1b895f7f6ce47a0'
+         '088e0807e677010cafe4e590e8711be1')
 
 build(){
-  export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||')
-  export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||')
+  export CFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+  export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
+
   cd ${srcdir}/gcc-${pkgver}
 
   if [ "$CARCH" = "x86_64" ]; then
-    patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1
+    patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
   fi
+  
+  # fix build issue with recent gcc
+  sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c
 
   # No fixincludes
   sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
   mkdir ../gcc-build
   cd ../gcc-build
   ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \
       --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \
       --disable-multilib --libdir=/usr/lib
-  make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1
-  make DESTDIR=${pkgdir} install-target-libstdc++-v3 || return 1
+  make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O"
+}
+
+package() {
+  cd ${srcdir}/gcc-build
+  make DESTDIR=${pkgdir} install-target-libstdc++-v3
 
   # Remove includefiles and libs provided by gcc
   rm -rf ${pkgdir}/usr/{include,share/locale}