1 files changed, 31 insertions, 10 deletions
diff --git a/gcc-fortran/Pkgfile b/gcc-fortran/Pkgfile
index 7d3aa835f..7ad4b079c 100644
--- a/gcc-fortran/Pkgfile
+++ b/gcc-fortran/Pkgfile
@@ -5,18 +5,23 @@
 # Depends on: libmpfr
 
 name=gcc-fortran
-version=4.0.3
+version=4.1.2
 release=3
 source=(ftp://sources.redhat.com/pub/gcc/releases/gcc-$version/gcc-{core,fortran}-$version.tar.bz2 \
-	gcc-fortran-$version-version.patch)
+	gcc-fortran-$version-nocheck-fixincludes.patch \
+	gcc-fortran-$version-fixinc.patch)
 
 build() {
-	patch -d gcc-$version -p1 -i $SRC/gcc-fortran-$version-version.patch
-	cd gcc-$version
+	patch -d gcc-$version -p1 -i $SRC/gcc-fortran-$version-nocheck-fixincludes.patch
+	patch -d gcc-$version -p1 -i $SRC/gcc-fortran-$version-fixinc.patch
+
+	sed -i -e 's|VERSUFFIX ""|VERSUFFIX " (CRUX)"|' \
+		gcc-$version/gcc/version.c
+
 	mkdir build
 	cd build
 
-	../configure \
+	../gcc-$version/configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		--enable-languages=f95 \
@@ -27,15 +32,15 @@ build() {
 		--disable-nls \
 		--with-x=no
 
-	make
-	#make check
+	make bootstrap
+	make check
 	make DESTDIR=$PKG install
 
-	ln -s gfortran $PKG/usr/bin/f90
-	ln -s gfortran $PKG/usr/bin/f95
+	ln -fs gfortran $PKG/usr/bin/f90
+	ln -fs gfortran $PKG/usr/bin/f95
 
 	# remove un-needed files
-	find $PKG -name 'README' -exec rm {} \;
+	find $PKG -name 'README' -delete
 
 	rm \
 		$PKG/usr/lib/libiberty.a \
@@ -62,5 +67,21 @@ build() {
 	for i in `find $PKG -name '*.la' | sed -e "s|$PKG|/|"`; do
 		sed -i "s|-L$SRC[^ ]* ||g" $PKG/$i
 	done
+
+	# install distcc symlinks if distcc is installed
+	if prt-get listinst distcc > /dev/null; then
+		install -d $PKG/usr/lib/distcc
+		for c in f90 f95 gfortran; do
+			cd $PKG/usr/lib/distcc && ln -s ../../bin/distcc $c
+		done
+	fi
+
+	# install ccache symlinks if ccache is installed
+	if prt-get listinst ccache > /dev/null; then
+		install -d $PKG/usr/lib/ccache
+		for c in f90 f95 gfortran; do
+			cd $PKG/usr/lib/ccache && ln -s ../../bin/ccache $c
+		done
+	fi
 }