Revert "Revert gcc: Fixed build and removed not needed configure options"

[crossrootfs.git] / gcc / Pkgfile

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index b5d40096799da73980d8a8fa4d6a235ec365a3dd..795910fa63ead0ebbe6e34660e4a2f793c467309 100644 (file)
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -2,24 +2,22 @@
 # URL: http://gcc.gnu.org
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: libgmp libmpfr
+# Depends on: zlib libmpc
 
 name=gcc
-version=4.5.2
+version=4.6.1
 release=1
 source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-{core,g++}-$version.tar.bz2
-        $name-nocheck-fixincludes.patch)
+        $name-$version-gnueabihf.patch)
 
 
 build() {
   cd $name-$version
   
-  patch -p1 -i $SRC/$name-nocheck-fixincludes.patch
+  patch -p1 -i $SRC/$name-$version-gnueabihf.patch
   sed -i 's|REVISION|REVISION " (CRUX)"|' $name/version.c
   # apply a sed substitutio that will suppress the installation of libiberty.a
   sed 's|install_to_$(INSTALL_DEST) ||' -i libiberty/Makefile.in
-  # avoid hardcodeds
-  sed 's|@have_mktemp_command@|yes|' -i gcc/gccbug.in
 
   mkdir $SRC/build
   cd $SRC/build
@@ -37,6 +35,7 @@ build() {
                               --enable-__cxa_atexit \
                               --enable-clocale=gnu \
                               --enable-shared \
+                              --with-float=hard \
                               --disable-nls \
                               --with-x=no \
                               --with-system-zlib \
@@ -55,7 +54,7 @@ build() {
 
   mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
 
-  rm $PKG/usr/lib/libstdc++.so.6.0.14-gdb.py
+  rm $PKG/usr/lib/libstdc++.so.6.0.16-gdb.py
   rm -r $PKG/usr/share
   rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}