r949 - crux-2.2/ports/core/gcc - crux-commits

16 Mar 2006

Author: jue
Date: 2006-03-16 17:26:09 +0100 (Thu, 16 Mar 2006)
New Revision: 949

Modified:
   crux-2.2/ports/core/gcc/.footprint
   crux-2.2/ports/core/gcc/.md5sum
   crux-2.2/ports/core/gcc/Pkgfile
Log:
gcc: readded Per's fixinc/version patches

Modified: crux-2.2/ports/core/gcc/.footprint
===================================================================

--- crux-2.2/ports/core/gcc/.footprint	2006-03-16 15:22:03 UTC (rev 948)
+++ crux-2.2/ports/core/gcc/.footprint	2006-03-16 16:26:09 UTC (rev 949)
@@ -278,9 +278,6 @@
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/float.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/iso646.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/limits.h
-drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/linux/
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/linux/a.out.h
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/linux/flat.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/mm3dnow.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/mm_malloc.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/mmintrin.h
@@ -297,8 +294,6 @@
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/objc/sarray.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/objc/thr.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/objc/typedstream.h
-drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/openssl/
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/openssl/bn.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/pmmintrin.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/stdarg.h
 -rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.0.3/include/stdbool.h

Modified: crux-2.2/ports/core/gcc/.md5sum
===================================================================
--- crux-2.2/ports/core/gcc/.md5sum	2006-03-16 15:22:03 UTC (rev 948)
+++ crux-2.2/ports/core/gcc/.md5sum	2006-03-16 16:26:09 UTC (rev 949)
@@ -1,3 +1,5 @@
+3e39f8fe9e3a36813f4c2370cd457de5  gcc-4.0.3-fixinc.patch
 31e541f9ac2c8613bc92b91db453f0a9  gcc-4.0.3-latentbug-addrefvars.patch
 36fb6ec15a5f2a6572da0b02a3cf9d66  gcc-4.0.3-nocheck-fixincludes.patch
+e35acd0ee75799f0a82b6e9c7e330073  gcc-4.0.3-version.patch
 6ff1af12c53cbb3f79b27f2d6a9a3d50  gcc-4.0.3.tar.bz2

Modified: crux-2.2/ports/core/gcc/Pkgfile
===================================================================
--- crux-2.2/ports/core/gcc/Pkgfile	2006-03-16 15:22:03 UTC (rev 948)
+++ crux-2.2/ports/core/gcc/Pkgfile	2006-03-16 16:26:09 UTC (rev 949)
@@ -7,11 +7,15 @@
 release=2
 source=(ftp://sources.redhat.com/pub/gcc/releases/$name-$version/$name-$version.tar.bz2 \
         $name-$version-latentbug-addrefvars.patch \
-        $name-$version-nocheck-fixincludes.patch)
+        $name-$version-nocheck-fixincludes.patch \
+        $name-$version-version.patch \
+        $name-$version-fixinc.patch)
 	
 build() {
     patch -d $name-$version -p1 < $SRC/$name-$version-latentbug-addrefvars.patch
     patch -d $name-$version -p1 < $SRC/$name-$version-nocheck-fixincludes.patch
+    patch -d $name-$version -p1 < $SRC/$name-$version-version.patch
+    patch -d $name-$version -p1 < $SRC/$name-$version-fixinc.patch
 
     mkdir build
     cd build
@@ -24,7 +28,6 @@
 				--enable-shared \
 				--disable-nls \
                                 --with-x=no
-    
     make bootstrap
     make check
     make DESTDIR=$PKG install
@@ -36,9 +39,6 @@
     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/firefox \
-           $PKG/usr/lib/gcc/*/$version/include/X11 \
-           $PKG/usr/lib/gcc/*/$version/include/root 
+	   $PKG/usr/lib/gcc/*/$version/include/README 
     sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/{libstdc++.la,libsupc++.la}
 }

    

r949 - crux-2.2/ports/core/gcc

crux＠crux.nu

tags

participants (1)