[arch-commits] CVS update of extra/lib/libstdc++5 (PKGBUILD)

[Thomas Baechler]

    Date: Sunday, September 16, 2007 @ 13:44:37
  Author: thomas
    Path: /home/cvs-extra/extra/lib/libstdc++5

Modified: PKGBUILD (1.2 -> 1.3)

upgpkg: libstdc++5 3.3.6-2


----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


Index: extra/lib/libstdc++5/PKGBUILD
diff -u extra/lib/libstdc++5/PKGBUILD:1.2 extra/lib/libstdc++5/PKGBUILD:1.3
--- extra/lib/libstdc++5/PKGBUILD:1.2	Tue Jun 20 18:15:28 2006
+++ extra/lib/libstdc++5/PKGBUILD	Sun Sep 16 13:44:36 2007
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD,v 1.2 2006/06/20 22:15:28 andyrtr Exp $
+# $Id: PKGBUILD,v 1.3 2007/09/16 17:44:36 thomas Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libstdc++5
 pkgver=3.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Standard C++ library version 3"
 arch=(i686 x86_64)
 url="http://gcc.gnu.org"
-depends=(gcc)
-makedepends=(binutils)
-options=(NOLIBTOOL)
+depends=('gcc-libs')
+makedepends=('binutils' 'gcc')
+options=(!libtool)
 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 MAKEFLAGS="-j1"
+  export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||')
+  export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||')
   cd ${startdir}/src/gcc-${pkgver}
 
-  [ "$CARCH" = "x86_64" ] && patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1
+  if [ "$CARCH" = "x86_64" ]; then
+    patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1
+  fi
 
   # No fixincludes
   sed -i -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
@@ -31,10 +35,7 @@
   make DESTDIR=${startdir}/pkg install-target-libstdc++-v3 || return 1
 
   # Remove includefiles and libs provided by gcc
-  rm -rf ${startdir}/pkg/usr/include
+  rm -rf ${startdir}/pkg/usr/{include,share/locale}
   rm -f ${startdir}/pkg/usr/lib/*.a
   rm -f ${startdir}/pkg/usr/lib/libstdc++.so
 }
-
-
-