Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/collectd/PKGBUILD
	community/drivel/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/gnomesu/PKGBUILD
	community/gnuchess/PKGBUILD
	community/gphpedit/PKGBUILD
	community/gsql/PKGBUILD
	community/libmatchbox/PKGBUILD
	community/lockfile-progs/PKGBUILD
	community/opencc/PKGBUILD
	community/roxterm/PKGBUILD
	community/uriparser/PKGBUILD
	community/xcircuit/PKGBUILD
	core/bison/PKGBUILD
	core/curl/PKGBUILD
	core/expat/PKGBUILD
	core/gcc/PKGBUILD
	core/gpm/PKGBUILD
	core/m4/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	extra/alsa-lib/PKGBUILD
	extra/alsa-utils/PKGBUILD
	extra/bitlbee/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream/PKGBUILD
	extra/freeglut/PKGBUILD
	extra/gob2/PKGBUILD
	extra/libcdio-paranoia/PKGBUILD
	extra/liblqr/PKGBUILD
	extra/libnl1/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libwpd/PKGBUILD
	extra/xorg-server/PKGBUILD

1 files changed, 21 insertions, 18 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index ea2135b2a..4e3f60f67 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181166 2013-04-02 06:48:56Z allan $
+# $Id: PKGBUILD 182769 2013-04-15 01:13:43Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,19 +10,19 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.8.0
-pkgrel=1
-#_snapshot=4.7-20120721
+pkgrel=2
+_snapshot=4.8-20130411
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
 makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
 [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
-checkdepends=('dejagnu')
+checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-md5sums=('e6040024eb9e761c3bea348d1fa5abb0')
+source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2)
+        #ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+md5sums=('cb529205469260f0d56adc01088c4850')
 
 if [ -n "${_snapshot}" ]; then
   _basedir=gcc-${_snapshot}
@@ -30,7 +30,7 @@ else
   _basedir=gcc-${pkgver}
 fi
 
-build() {
+prepare() {
   cd ${srcdir}/${_basedir}
 
   # Do not run fixincludes
@@ -42,14 +42,20 @@ build() {
 
   echo ${pkgver} > gcc/BASE-VER
 
+  # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+  mkdir ${srcdir}/gcc-build
+}
+
+build() {
+  cd ${srcdir}/gcc-build
+
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
   # Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built.
   export BOOT_CFLAGS="$CFLAGS"
   export CFLAGS_FOR_BUILD="$CFLAGS"
@@ -157,20 +163,17 @@ package_gcc()
   mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  # -f makes rm return 0 if the archive doesn't exist
   rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
   rm -f $pkgdir/usr/lib/*.so*
-  rm -f $pkgdir/usr/lib/lib{atomic,ffi,gfortran,go{,begin},iberty,objc}.a
+  rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
   rm -f $pkgdir/usr/lib/libgfortran.spec
-  rm -fr $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/ffi{,target}.h
+  rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
   rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
   rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -fr $pkgdir/usr/lib/go
-  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libffi,libgomp,libquadmath,libitm}.info
+  rm -rf $pkgdir/usr/lib/go
+  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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 expect this symlinks
   ln -s gcc ${pkgdir}/usr/bin/cc