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

Conflicts:
	community/libgeotiff/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD

1 files changed, 18 insertions, 20 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index becff84d0..00060ed11 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168332 2012-10-08 22:50:16Z allan $
+# $Id: PKGBUILD 169769 2012-10-28 11:11:42Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,29 +10,23 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.7.2
-pkgrel=1
+pkgrel=2
 #_snapshot=4.7-20120721
-_libstdcppmanver=20120924		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-if [[ "${CARCH}" != "mips64el" ]]; then
-    makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-else
-    makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl')
-fi
+makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen')
+[[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
 checkdepends=('dejagnu')
 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
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
     gcc_mips64el_lib.patch
 	gcc-4.7.1-libada-pic.patch
 	gcc-4.7.1-libgo-write.patch)
 md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         '7f3d52515daafffb57c287f427381106'
          'ced48436c1b3c981d721a829f1094de1'
          '474b8f5a7dee6ddd96b95a7240bfb961'
          '2acbc9d35cc9d72329dc71d6b1f162ef'
@@ -108,12 +102,16 @@ build() {
       --disable-build-with-cxx --disable-build-poststage1-with-cxx \
       --enable-checking=release
   make
+  
+  # make documentation
+  cd $CHOST/libstdc++-v3
+  make doc-man-doxygen
 }
 
 check() {
   # Takes days and no one here uses it.
   if [ "$CARCH" != "mips64el" ] ; then
-  cd gcc-build
+  cd ${srcdir}/gcc-build
 
   # increase stack size to prevent test failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
@@ -132,7 +130,7 @@ package_gcc-libs()
   depends=('glibc>=2.16')
   install=gcc-libs.install
 
-  cd gcc-build
+  cd ${srcdir}/gcc-build
   make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
   for lib in libmudflap libgomp libstdc++-v3/src; do
     make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
@@ -162,11 +160,11 @@ package_gcc-libs()
 package_gcc()
 {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl')
   groups=('base-devel')
   install=gcc.install
 
-  cd gcc-build
+  cd ${srcdir}/gcc-build
   
   make -j1 DESTDIR=${pkgdir} install
 
@@ -223,8 +221,8 @@ EOF
 
   # install the libstdc++ man pages
   install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \
-    ${pkgdir}/usr/share/man/man3/
+  install -m644 -t ${pkgdir}/usr/share/man/man3 \
+    ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
@@ -237,7 +235,7 @@ package_gcc-fortran()
   depends=("gcc=$pkgver-$pkgrel")
   install=gcc-fortran.install
 
-  cd gcc-build
+  cd ${srcdir}/gcc-build
   make -j1 DESTDIR=${pkgdir} install-target-libquadmath
   make -j1 DESTDIR=$pkgdir install-target-libgfortran
   make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
@@ -260,7 +258,7 @@ package_gcc-objc()
   pkgdesc="Objective-C front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
 
-  cd gcc-build
+  cd ${srcdir}/gcc-build
   make -j1 DESTDIR=$pkgdir install-target-libobjc
   install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
@@ -279,7 +277,7 @@ package_gcc-ada()
   depends=("gcc=$pkgver-$pkgrel")
   install=gcc-ada.install
 
-  cd gcc-build/gcc
+  cd ${srcdir}/gcc-build/gcc
   make -j1 DESTDIR=$pkgdir ada.install-{common,info}
   install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
 
@@ -296,7 +294,7 @@ package_gcc-go()
   depends=("gcc=$pkgver-$pkgrel")
   install=gcc-go.install
 
-  cd gcc-build
+  cd ${srcdir}/gcc-build
   make -j1 DESTDIR=$pkgdir install-target-libgo
   make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1