[arch-commits] Commit in libstdc++5/trunk (PKGBUILD)

[Pierre Schmitz]

    Date: Friday, September 9, 2011 @ 17:09:57
  Author: pierre
Revision: 137574

cleanup

Modified:
  libstdc++5/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-09 20:15:33 UTC (rev 137573)
+++ PKGBUILD	2011-09-09 21:09:57 UTC (rev 137574)
@@ -5,15 +5,17 @@
 pkgver=3.3.6
 pkgrel=3
 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||')
@@ -21,7 +23,7 @@
   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 ../gcc-3.4.3-no_multilib_amd64.patch
   fi
 
   # No fixincludes
@@ -31,9 +33,13 @@
   ../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}
   rm -f ${pkgdir}/usr/lib/*.a