[arch-commits] Commit in gcc-libs/repos (testing-x86_64 testing-x86_64/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Sunday, June 29, 2008 @ 12:44:40
  Author: andyrtr
Revision: 3702

Merged revisions 3674-3701 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gcc-libs/trunk

........
  r3701 | andyrtr | 2008-06-29 16:44:09 +0000 (So, 29 Jun 2008) | 1 line
  
  upgpkg: gcc-libs 4.3.1-2
........

Modified:
  gcc-libs/repos/testing-x86_64/	(properties)
  gcc-libs/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


Property changes on: gcc-libs/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /gcc-libs/trunk:1-3673
   + /gcc-libs/trunk:1-3701

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-06-29 16:44:09 UTC (rev 3701)
+++ testing-x86_64/PKGBUILD	2008-06-29 16:44:40 UTC (rev 3702)
@@ -31,19 +31,21 @@
     return 1
   fi
   
-  #cd ${startdir}/src/gcc-${pkgver}
-  cd ${startdir}/src/gcc-${_snapshot}
+  #cd ${srcdir}/gcc-${pkgver}
+  cd ${srcdir}/gcc-${_snapshot}
   # Don't install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
   if [ "${CARCH}" = "x86_64" ]; then
     patch -Np1 -i ../gcc_pure64.patch || return 1
   fi
-  patch -Np0 -i ${startdir}/src/gcc-hash-style-both.patch || return 1
+  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1
 
   # Don't run fixincludes
   sed -i -e 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
 
+  echo ${pkgver} > gcc/BASE-VER
+
   mkdir build
   cd build
   ../configure --prefix=/usr --enable-shared \
@@ -52,12 +54,12 @@
       --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \
       --with-tune=generic
   make || return 1
-  make -j1 DESTDIR=${startdir}/pkg install-target-libstdc++-v3 install-target-libmudflap install-target-libgomp install-target-libssp install-target-libgfortran install-target-libobjc install-target-libgcc || return 1
+  make -j1 DESTDIR=${pkgdir} install-target-libstdc++-v3 install-target-libmudflap install-target-libgomp install-target-libssp install-target-libgfortran install-target-libobjc install-target-libgcc || return 1
 
   # Cleanup, libgomp installs the whole compiler it seems...
-  rm -rf ${startdir}/pkg/usr/include
-  rm -rf ${startdir}/pkg/usr/lib/gcc
-  rm -rf ${startdir}/pkg/usr/bin
-  rm -rf ${startdir}/pkg/usr{,share}/man
-  find ${startdir}/pkg -name gcc.mo -delete
+  rm -rf ${pkgdir}/usr/include
+  rm -rf ${pkgdir}/usr/lib/gcc
+  rm -rf ${pkgdir}/usr/bin
+  rm -rf ${pkgdir}/usr{,share}/man
+  find ${pkgdir} -name gcc.mo -delete
 }