gcc-fortran: 4.3.3 -> 4.4.2

5 files changed, 69 insertions, 22 deletions

diff --git a/gcc-fortran/.footprint b/gcc-fortran/.footprint
index 633e8ed27..52143c971 100644
--- a/gcc-fortran/.footprint
+++ b/gcc-fortran/.footprint
@@ -6,15 +6,15 @@ lrwxrwxrwx	root/root	usr/bin/f95 -> gfortran
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/gcc/
 drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/
-drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/
--rwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/f951
-drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/finclude/
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/finclude/omp_lib.f90
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/finclude/omp_lib.h
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/finclude/omp_lib.mod
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/finclude/omp_lib_kinds.mod
--rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/libgfortranbegin.a
--rwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.3.3/libgfortranbegin.la
+drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/
+-rwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/f951
+drwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/finclude/
+-rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/finclude/omp_lib.f90
+-rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/finclude/omp_lib.h
+-rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/finclude/omp_lib.mod
+-rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/finclude/omp_lib_kinds.mod
+-rw-r--r--	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/libgfortranbegin.a
+-rwxr-xr-x	root/root	usr/lib/gcc/i686-pc-linux-gnu/4.4.2/libgfortranbegin.la
 -rw-r--r--	root/root	usr/lib/libgfortran.a
 -rwxr-xr-x	root/root	usr/lib/libgfortran.la
 lrwxrwxrwx	root/root	usr/lib/libgfortran.so -> libgfortran.so.3.0.0
diff --git a/gcc-fortran/.md5sum b/gcc-fortran/.md5sum
index 186643db7..cefe182e8 100644
--- a/gcc-fortran/.md5sum
+++ b/gcc-fortran/.md5sum
@@ -1,3 +1,4 @@
-1739288c2c7b1472796b33d641dbdbbd  gcc-core-4.3.3.tar.bz2
-a617c4d3fa11e0c9410ac213eb061677  gcc-fortran-4.2.4-nocheck-fixincludes.patch
-8771e6190dd4f3178b2a7978d2380a5d  gcc-fortran-4.3.3.tar.bz2
+d50ec5af20508974411d0c83c5f4e396  gcc-core-4.4.2.tar.bz2
+184897e1b5e8c76760813c1955ee02c2  gcc-fortran-4.4.2.tar.bz2
+a617c4d3fa11e0c9410ac213eb061677  gcc-nocheck-fixincludes.patch
+547895a1bfb0224835995a3bd9690ae4  test-demangle.c.diff
diff --git a/gcc-fortran/Pkgfile b/gcc-fortran/Pkgfile
index 1ef41ea28..8eae9c8fc 100644
--- a/gcc-fortran/Pkgfile
+++ b/gcc-fortran/Pkgfile
@@ -5,24 +5,23 @@
 # Depends on: libmpfr
 
 name=gcc-fortran
-version=4.3.3
+version=4.4.2
 release=1
 source=(ftp://sources.redhat.com/pub/gcc/releases/gcc-$version/gcc-{core,fortran}-$version.tar.bz2
-	$name-4.2.4-nocheck-fixincludes.patch)
+	gcc-nocheck-fixincludes.patch test-demangle.c.diff)
 
 build() {
-	patch -d gcc-$version -p 1 -i $SRC/$name-4.2.4-nocheck-fixincludes.patch
-
-	sed -i gcc-$version/gcc/version.c \
-		-e 's|VERSUFFIX ""|VERSUFFIX " (CRUX)"|'
+	patch -d gcc-$version -p 1 -i $SRC/gcc-nocheck-fixincludes.patch
+	patch -d gcc-$version -p 0 -i $SRC/test-demangle.c.diff
 
 	mkdir build
 	cd build
 
 	../gcc-$version/configure \
+		--with-pkgversion="(CRUX)" \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
-		--enable-languages=f95 \
+		--enable-languages=fortran \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
 		--enable-clocale=gnu \
@@ -30,7 +29,14 @@ build() {
 		--disable-nls \
 		--with-x=no
 
-	make bootstrap
+	if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
+		make STAGE_CC_WRAPPER='/usr/bin/ccache' BOOT_CFLAGS="$CFLAGS" bootstrap
+	elif [ -n "$(pkginfo -i | grep '^distcc ')" ]; then
+		make STAGE_CC_WRAPPER='/usr/bin/distcc' BOOT_CFLAGS="$CFLAGS" bootstrap
+	else
+		make BOOT_CFLAGS="$CFLAGS" bootstrap
+	fi
+
 	make -j 1 check
 	make -j 1 DESTDIR=$PKG install
 
@@ -53,7 +59,7 @@ build() {
 		$PKG/usr/lib/gcc/*/$version/include		
 
 	# remove files already on the system out of the port
-	for i in $(pkginfo -l gcc |sed -e "s|^|/|"); do
+	for i in $(pkginfo -l gcc | sed -e "s|^|/|"); do
 		if [ -e "$i" ] && [ ! -d "$i" ]; then
 			if [ -e "$PKG$i" ]; then
 				rm "$PKG$i"
@@ -65,7 +71,7 @@ build() {
 	find $PKG -depth -empty -exec rm -r {} \;
 
 	# remove build paths from *.la files
-	for i in `find $PKG -name '*.la' | sed -e "s|$PKG|/|"`; do
+	for i in $(find $PKG -name '*.la' | sed -e "s|$PKG|/|"); do
 		sed -i "s|-L$SRC[^ ]* ||g" $PKG/$i
 	done
 }
diff --git a/gcc-fortran/gcc-fortran-4.2.4-nocheck-fixincludes.patch b/gcc-fortran/gcc-nocheck-fixincludes.patch
index 5faedf454..5faedf454 100644
--- a/gcc-fortran/gcc-fortran-4.2.4-nocheck-fixincludes.patch
+++ b/gcc-fortran/gcc-nocheck-fixincludes.patch
diff --git a/gcc-fortran/test-demangle.c.diff b/gcc-fortran/test-demangle.c.diff
new file mode 100644
index 000000000..bda8b7d7e
--- /dev/null
+++ b/gcc-fortran/test-demangle.c.diff
@@ -0,0 +1,40 @@
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39752
+
+Index: libiberty/testsuite/test-demangle.c
+===================================================================
+--- libiberty/testsuite/test-demangle.c	(revision 145957)
++++ libiberty/testsuite/test-demangle.c	(working copy)
+@@ -46,7 +46,7 @@
+ #define LINELEN 80
+ 
+ static void
+-getline(buf)
++get_line(buf)
+      struct line *buf;
+ {
+   char *data = buf->data;
+@@ -196,12 +196,12 @@
+     {
+       const char *inp;
+       
+-      getline (&format);
++      get_line (&format);
+       if (feof (stdin))
+ 	break;
+ 
+-      getline (&input);
+-      getline (&expect);
++      get_line (&input);
++      get_line (&expect);
+ 
+       inp = protect_end (input.data);
+ 
+@@ -322,7 +322,7 @@
+ 
+       if (no_params)
+ 	{
+-	  getline (&expect);
++	  get_line (&expect);
+ 	  result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES);
+ 
+ 	  if (result