X-Git-Url: http://gitweb/?a=blobdiff_plain;f=gcc%2FPkgfile;h=6b6f46d353f39701366311868a639c1827125423;hb=5371a9acf3548c955c0d19eed402827a6f1ac44a;hp=1343a1eafd99a8f0f1741d9002bea896de408d9e;hpb=676c65bf6104e0cb27cae42d1b14d88cfe787bfa;p=ports%2Fcore-arm.git

diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 1343a1e..6b6f46d 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -1,24 +1,27 @@
 # Description: The GNU Compiler Collection
-# URL: http://gcc.gnu.org/
+# 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: libmpc zlib
+# Depends on: zlib libmpc
 
 name=gcc
-version=4.6.2
-release=1
-
-source=(http://ftp.gnu.org/gnu/gcc/$name-$version/$name-$version.tar.bz2
-        $name-nocheck-fixincludes.patch gcc-4.6-gnueabihf.patch)
+version=4.7.2
+release=2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/$name-$version/$name-$version.tar.bz2
+        $name-nocheck-fixincludes.patch
+        $name-$version-gnueabihf.patch)
 
 build() {
-  patch -d $name-$version -p1 -i $SRC/$name-4.6-gnueabihf.patch
   patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch
+  patch -d $name-$version -p1 -i $SRC/$name-$version-gnueabihf.patch
 
   mkdir build
   cd build
+
   ../$name-$version/configure --prefix=/usr \
-                              --build=$MACHTYPE \
+                              --build=arm-unknown-linux-gnueabihf \
+                              --with-abi=aapcs-linux --with-mode=arm \
+                              --with-float=hard \
                               --mandir=/usr/man \
                               --libexecdir=/usr/lib \
                               --enable-languages=c,c++,objc \
@@ -26,11 +29,10 @@ build() {
                               --enable-__cxa_atexit \
                               --enable-clocale=gnu \
                               --enable-shared \
-                              --with-float=hard \
                               --disable-nls \
                               --with-x=no \
                               --with-system-zlib \
-                              --with-pkgversion="CRUX"
+                              --with-pkgversion="CRUX-ARM"
   make bootstrap
   make -j1 DESTDIR=$PKG install
 
@@ -39,12 +41,14 @@ build() {
   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/
+  mv $PKG/usr/lib/gcc/*/4.7.2/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/4.7.2/include/
+  cp ../$name-$version/gcc/config/arm/arm-cores.def $PKG/usr/lib/gcc/arm-unknown-linux-gnueabihf/$version/plugin/include/config/arm/
+  cp ../$name-$version/gcc/config/vxworks-dummy.h $PKG/usr/lib/gcc/arm-unknown-linux-gnueabihf/$version/plugin/include/config/
 
-  rm $PKG/usr/lib/{libiberty.a,libstdc++.so.*-gdb.py}
-  rm -r $PKG/usr/share 
-  rm -r $PKG/usr/bin/*-linux-gnueabi*
-  rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed} 
+  rm -f $PKG/usr/lib/{libiberty.a,libstdc++.so.6.0.17-gdb.py}
+  rm -r $PKG/usr/share
+  rm -r $PKG/usr/bin/*-linux-gnu*
+  rm -r $PKG/usr/lib/gcc/*/4.7.2/{install-tools,include-fixed}
 
   sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
 }