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

[Allan McRae]

    Date: Friday, October 23, 2009 @ 12:48:44
  Author: allan
Revision: 56600

Merged revisions 56599 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcc/trunk

........
  r56599 | allan | 2009-10-24 02:47:41 +1000 (Sat, 24 Oct 2009) | 2 lines
  
  upgpkg: gcc 4.4.2-2
      move fortran and objc libs to gcc-libs
........

Modified:
  gcc/repos/testing-i686/	(properties)
  gcc/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


Property changes on: gcc/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gcc/trunk:1-56153
   + /gcc/trunk:1-56599

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-10-23 16:47:41 UTC (rev 56599)
+++ testing-i686/PKGBUILD	2009-10-23 16:48:44 UTC (rev 56600)
@@ -6,7 +6,7 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada')
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 #_snapshot=4.4-20090630
 _libstdcppmanver=4.4.0
 pkgdesc="The GNU Compiler Collection"
@@ -77,6 +77,12 @@
   make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
   make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
 
+  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
+
+  make -j1 DESTDIR=${pkgdir} install-target-libobjc
+  # I thought I said to only install the lib...
+  rm -rf ${pkgdir}/usr/lib/gcc/
+
   # remove static libraries
   find ${pkgdir} -name *.a -delete
   
@@ -133,6 +139,9 @@
   make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
   install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
   
+  # remove libraries included in gcc-libs
+  rm -f ${pkgdir}/usr/lib/libgfortran.so*
+  
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
@@ -148,6 +157,9 @@
   install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
 
+  # remove libraries included in gcc-libs
+  rm -f ${pkgdir}/usr/lib/libobjc.so*
+
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION