Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

1 files changed, 30 insertions, 8 deletions

diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
index d1554a1bb..b42d83c86 100644
--- a/community/mingw32-gcc/PKGBUILD
+++ b/community/mingw32-gcc/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 39743 2011-02-15 21:13:52Z spupykin $
+# $Id: PKGBUILD 45471 2011-04-22 05:36:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc
 pkgver=4.5.2
-pkgrel=2
-arch=(i686 x86_64 'mips64el')
+pkgrel=3
+arch=(i686 x86_64 mips64el)
 pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
-depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils cloog-ppl gmp)
+depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils gmp)
 replaces=(mingw32-gcc-base)
 provides=(mingw32-gcc-base)
-options=(!strip force)
+options=(!strip)
 url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/"
 license=(GPL LGPL)
 source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma)
@@ -29,7 +29,8 @@ build()
   chmod ugo+x $srcdir/gcc-$pkgver/configure
   chmod ugo+x $srcdir/gcc-$pkgver/move-if-change
 
-  [ $NOEXTRACT -eq 1 ] || $srcdir/gcc-$pkgver/configure \
+  msg "gcc"
+  [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
      --target=i486-mingw32 \
      --host=$CHOST \
      --build=$CHOST \
@@ -39,16 +40,37 @@ build()
      --enable-sjlj-exceptions \
      --enable-hash-synchronization \
      --disable-nls \
-     --disable-libssp \
+     --disable-libssp
 
   make
   make install DESTDIR=$pkgdir
 
+  msg "libgcc"
   make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install
+
+  msg "libstdc++"
   make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
 
+#  msg "libgomp"
+#  mkdir -p i486-mingw32/libgomp
+#  cd i486-mingw32/libgomp
+#  [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
+#     --target=i486-mingw32 \
+#     --host=$CHOST \
+#     --build=$CHOST \
+#     --prefix=/usr \
+#     --enable-languages=c,c++ \
+#     --enable-shared \
+#     --enable-sjlj-exceptions \
+#     --enable-hash-synchronization \
+#     --disable-nls \
+#     --disable-libssp
+#  make -j1 DESTDIR=$pkgdir all install
+
+  msg "fixes"
   mkdir -p $pkgdir/usr/i486-mingw32/bin/
-  mv $pkgdir/usr/bin/*.dll $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/
+  mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/
+  mv $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/
 
   cd $pkgdir
   rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \