kernel26-libre and gcc

1 files changed, 31 insertions, 36 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 516fcb58c..b30aeeb2b 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -4,7 +4,7 @@
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
 
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-go')
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 pkgver=4.6.0
 pkgrel=3
 _snapshot=4.6-20110415
@@ -17,8 +17,8 @@ url="http://gcc.gnu.org"
 #makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu')
 makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'dejagnu')
 options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc}-${pkgver}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc}-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
   gcc_mips64el_lib.patch
@@ -50,32 +50,33 @@ build() {
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -Np1 -i ${srcdir}/gcc_pure64.patch
-  elif [ "${CARCH}" = "mips64el" ]; then
-    patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch
-  fi
-  patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
+ if [ "${CARCH}" = "x86_64" ]; then
+   patch -Np1 -i ${srcdir}/gcc_pure64.patch
+ elif [ "${CARCH}" = "mips64el" ]; then
+   patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch
+ fi
+ patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.parabolagnulinux.org/ \
-      --enable-languages=c,c++,fortran,lto,objc,obj-c++ \
-      --enable-shared --enable-threads=posix \
-      --with-system-zlib --enable-__cxa_atexit \
-      --disable-libunwind-exceptions --enable-clocale=gnu \
-      --enable-gnu-unique-object --enable-linker-build-id \
-      --with-ppl --enable-cloog-backend=isl \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --disable-multilib --disable-libstdcxx-pch \
-      --enable-checking=release
+  mkdir gcc-build
+  cd gcc-build
+
+ ${_basedir}/configure --prefix=/usr \
+     --libdir=/usr/lib --libexecdir=/usr/lib \
+     --mandir=/usr/share/man --infodir=/usr/share/info \
+     --with-bugurl=https://bugs.parabolagnulinux.org/ \
+     --enable-languages=c,c++,fortran,lto,objc,obj-c++ \
+     --enable-shared --enable-threads=posix \
+     --with-system-zlib --enable-__cxa_atexit \
+     --disable-libunwind-exceptions --enable-clocale=gnu \
+     --enable-gnu-unique-object --enable-linker-build-id \
+     --with-ppl --enable-cloog-backend=isl \
+     --enable-lto --enable-gold --enable-ld=default \
+     --enable-plugin --with-plugin-ld=ld.gold \
+     --disable-multilib --disable-libstdcxx-pch \
+     --enable-checking=release
   make
 }
 
@@ -132,18 +133,13 @@ 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/bin/{$CHOST-,}gfortran
   rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
+  rm $pkgdir/usr/lib/lib{gfortran,objc}.a
   rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{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/info/libgomp.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 $pkgdir/usr/share/man/man1/gfortran.1
 
   # many packages require these symlinks
   install -dm755 ${pkgdir}/lib
@@ -203,8 +199,7 @@ 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 ${pkgdir}/usr/lib/libgfortran.so*
   
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \