Use profiledbootstrap and fix gcc packaging errors.

The PKGBUILD expects to have more files installed and to use only
*/lib for libraries, not */lib32 for some of them.

1 files changed, 17 insertions, 17 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 06e61884e..0dd465937 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -80,7 +80,7 @@ build() {
       --enable-plugin --with-plugin-ld=ld.gold \
       --disable-multilib --disable-libssp --disable-libstdcxx-pch \
       --enable-checking=release
-  make
+  make profiledbootstrap
 }
 
 check() {
@@ -115,7 +115,7 @@ package_gcc-libs()
   make -j1 DESTDIR=${pkgdir} install-target-libobjc
 
   # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
+  rm -rf ${pkgdir}/usr/lib{,32}/{gcc/,libgfortran.spec}
 
   # remove static libraries
   find ${pkgdir} -name *.a -delete
@@ -136,18 +136,18 @@ package_gcc()
   
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
   make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
+  rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm -f $pkgdir/usr/lib{,32}/*.so*
+  rm -f $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm -f $pkgdir/usr/lib{,32}/libgfortran.spec
+  rm -rf $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
+  rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
+  rm -rf $pkgdir/usr/lib{,32}/go
+  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
+  rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm -f $pkgdir/usr/share/man/man3/ffi*
 
   # many packages require these symlinks
   install -dm755 ${pkgdir}/lib
@@ -211,8 +211,8 @@ package_gcc-fortran()
   install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
   
   # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
+  rm -f ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
+  rm -f ${pkgdir}/usr/share/info/libquadmath.info
   
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -230,7 +230,7 @@ package_gcc-objc()
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
 
   # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib/libobjc.so*
+  rm -f ${pkgdir}/usr/lib{,32}/libobjc.so*
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \