X-Git-Url: http://gitweb/?a=blobdiff_plain;f=gcc%2FPkgfile;h=795910fa63ead0ebbe6e34660e4a2f793c467309;hb=9be8a54407f91732078beb4b02a66d569ef97a8d;hp=11386154906a7c3b8d640511048dd265593371b5;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 1138615..795910f 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -1,61 +1,62 @@
 # Description: The GNU Compiler Collection
 # URL: http://gcc.gnu.org
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, crux-arm at mikeux dot dyndns dot org
-# Depends on: libgmp libmpfr
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: zlib libmpc
 
 name=gcc
-version=4.3.3
+version=4.6.1
 release=1
-source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-{core,g++,objc}-$version.tar.bz2
-        $name-$version-nocheck-fixincludes.patch)
+source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-{core,g++}-$version.tar.bz2
+        $name-$version-gnueabihf.patch)
 
 
 build() {
-    patch -d $name-$version -p1 -i $SRC/$name-$version-nocheck-fixincludes.patch
-    sed -i 's|REVISION|REVISION " (CRUX)"|' $name-$version/$name/version.c
-
-    cd $name-$version
-    # 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
-
-    LDFLAGS="-Wl,-rpath-link,$CROSSTOOLS/$CTARGET/lib" \
-    ../$name-$version/configure --build=$CHOST \
-                                --host=$CTARGET \
-                                --target=$CTARGET \
-                                --prefix=/usr \
-                                --libexecdir=/usr/lib \
-                                --enable-languages=c,c++ \
-                                --enable-threads=posix \
-                                --enable-shared \
-                                --enable-__cxa_atexit \
-                                --enable-clocale=gnu \
-                                --disable-nls \
-                                --disable-libstdcxx-pch \
-                                --with-x=no
-
-    # prevent GCC from looking in the wrong directories for headers and libraries
-    sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile
-
-    make
-    make -j1 DESTDIR=$PKG install
-
-    mkdir $PKG/lib
-    ln -sf ../usr/bin/cpp $PKG/lib/cpp
-    ln -sf gcc $PKG/usr/bin/cc
-    ln -sf g++ $PKG/usr/bin/c++
-    mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
-    rm -rf $PKG/usr/info $PKG/usr/lib/libiberty.a \
-           $PKG/usr/bin/*-linux-gnu-* \
-           $PKG/usr/lib/gcc/*/$version/install-tools \
-           $PKG/usr/lib/gcc/*/$version/include/README \
-           $PKG/usr/lib/gcc/*/$version/include-fixed
-
-    sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
+  cd $name-$version
+  
+  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
+
+  mkdir $SRC/build
+  cd $SRC/build
+
+  LDFLAGS="-Wl,-rpath-link,$CROSSTOOLS/$CTARGET/lib" \
+  ../$name-$version/configure --build=$CHOST \
+                              --host=$CTARGET \
+                              --target=$CTARGET \
+                              --prefix=/usr \
+                              --mandir=/usr/man \
+                              --libexecdir=/usr/lib \
+                              --enable-languages=c,c++ \
+                              --disable-libstdcxx-pch \
+                              --enable-threads=posix \
+                              --enable-__cxa_atexit \
+                              --enable-clocale=gnu \
+                              --enable-shared \
+                              --with-float=hard \
+                              --disable-nls \
+                              --with-x=no \
+                              --with-system-zlib \
+                              --with-pkgversion="CRUX"
+
+  # prevent GCC from looking in the wrong directories for headers and libraries
+  sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile
+
+  make
+  make DESTDIR=$PKG install
+
+  mkdir $PKG/lib
+  ln -sf ../usr/bin/cpp $PKG/lib/cpp
+  ln -sf gcc $PKG/usr/bin/cc
+  ln -sf g++ $PKG/usr/bin/c++
+
+  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.16-gdb.py
+  rm -r $PKG/usr/share
+  rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
+
+  sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
 }
-