gcc-fortran: 5.4.0 -> 6.3.0

4 files changed, 38 insertions, 50 deletions

diff --git a/gcc-fortran/.footprint b/gcc-fortran/.footprint
index 5f9309b0f..69dbbc8e5 100644
--- a/gcc-fortran/.footprint
+++ b/gcc-fortran/.footprint
@@ -6,34 +6,30 @@ lrwxrwxrwx	root/root	usr/bin/g77 -> gfortran
 -rwxr-xr-x	root/root	usr/bin/gfortran
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/gcc/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/finclude/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/finclude/ieee_arithmetic.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/finclude/ieee_exceptions.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/finclude/ieee_features.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/libcaf_single.a
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/libcaf_single.la
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/libgfortranbegin.a
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/32/libgfortranbegin.la
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/f951
-drwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/ieee_arithmetic.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/ieee_exceptions.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/ieee_features.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/omp_lib.f90
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/omp_lib.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/omp_lib.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/omp_lib_kinds.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/openacc.f90
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/openacc.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/openacc_kinds.mod
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/finclude/openacc_lib.h
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/libcaf_single.a
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/libcaf_single.la
--rw-r--r--	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/libgfortranbegin.a
--rwxr-xr-x	root/root	usr/lib/gcc/x86_64-unknown-linux-gnu/5.4.0/libgfortranbegin.la
+drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/
+drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/
+drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/
+drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/finclude/
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/finclude/ieee_arithmetic.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/finclude/ieee_exceptions.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/finclude/ieee_features.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/libcaf_single.a
+-rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/32/libcaf_single.la
+-rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/f951
+drwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/ieee_arithmetic.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/ieee_exceptions.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/ieee_features.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/omp_lib.f90
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/omp_lib.h
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/omp_lib.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/omp_lib_kinds.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/openacc.f90
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/openacc.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/openacc_kinds.mod
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/finclude/openacc_lib.h
+-rw-r--r--	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/libcaf_single.a
+-rwxr-xr-x	root/root	usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/libcaf_single.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 7c5200dab..874b65fe5 100644
--- a/gcc-fortran/.md5sum
+++ b/gcc-fortran/.md5sum
@@ -1,3 +1,3 @@
 61a057afa31006764b957a483ba90b9d  gcc-4.7.3-multilib-dirs.patch
-4c626ac2a83ef30dfb9260e6f59c2b30  gcc-5.4.0.tar.bz2
+677a7623c7ef6ab99881bc4e048debb6  gcc-6.3.0.tar.bz2
 7c9128522053af79791bcfdd55834c2a  gcc-nocheck-fixincludes.patch
diff --git a/gcc-fortran/.signature b/gcc-fortran/.signature
index f2f8c14cf..3748fc266 100644
--- a/gcc-fortran/.signature
+++ b/gcc-fortran/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32fRUjSNFTZDqVT620Xr3vNIFtegjCbvdNPw2hdCf8RA0vd7xppxb2YvSdTqCni5D5xiOtUbaHijPdbmXCtSzgI=
-SHA256 (Pkgfile) = 090e5c2b64e9336068cc072193792acbdadaece5d5b73cf814862565c4e755c0
-SHA256 (.footprint) = 15b5ee8ce136a4c9ea6000fb950f2c22b8791cbb5576eeaf58c02b02c4e3f72c
-SHA256 (gcc-5.4.0.tar.bz2) = 608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
+RWSagIOpLGJF3zWTzrhcpjqcPteMAp3VP8IWH+jFIsWBsO1wXG2bknRFEAGEWPjNChVFkXq4tgGgQ/d7wTzuVkQLyxD171n8Lgo=
+SHA256 (Pkgfile) = e70d09aead9c4470af924088ca6152bc34b13e489f22d94f304cd2de40244d5e
+SHA256 (.footprint) = dd413c3bc516dadee528a57acc2f07df11d1630d83bcc9d6f9a17bb1188883ca
+SHA256 (gcc-6.3.0.tar.bz2) = f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f
 SHA256 (gcc-nocheck-fixincludes.patch) = 850a71d2c64b9f2bec31821bd972bf89c2d57764faf64948100eaf474fd63bbb
 SHA256 (gcc-4.7.3-multilib-dirs.patch) = 149b151999d0afad909ca0d1eaf1f9a81c9cd6499e56989ec4fc574d108eeef6
diff --git a/gcc-fortran/Pkgfile b/gcc-fortran/Pkgfile
index ca54d6540..6ccbd5e5e 100644
--- a/gcc-fortran/Pkgfile
+++ b/gcc-fortran/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libmpfr
 
 name=gcc-fortran
-version=5.4.0
+version=6.3.0
 release=1
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.bz2
 	gcc-nocheck-fixincludes.patch gcc-4.7.3-multilib-dirs.patch)
@@ -14,6 +14,9 @@ build() {
 	patch -d gcc-$version -p 1 -i $SRC/gcc-nocheck-fixincludes.patch
 	patch -d gcc-$version -p 1 -i $SRC/gcc-4.7.3-multilib-dirs.patch
 
+	# Do not run fixincludes
+	sed -i -e 's|\./fixinc\.sh|-c true|' gcc-$version/gcc/Makefile.in
+
 	install -d build
 	cd build
 
@@ -30,7 +33,7 @@ build() {
 		--with-system-zlib \
 		--enable-multilib \
 		--disable-sjlj-exceptions \
-		--with-pkgversion="CRUX"
+		--with-pkgversion="CRUX-x86_64-multilib"
 
 	if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
 		make STAGE_CC_WRAPPER='/usr/bin/ccache' BOOT_CFLAGS="$CFLAGS" bootstrap
@@ -44,9 +47,6 @@ build() {
 	ln -fs gfortran $PKG/usr/bin/f95
 	ln -fs gfortran $PKG/usr/bin/g77
 
-	# remove un-needed files
-	find $PKG -name 'README' -delete
-
 	# remove files already on the system out of the port
 	for i in $(pkginfo -l gcc | sed -e "s|^|/|") $(pkginfo -l binutils | sed -e "s|^|/|"); do
 		if [ -e "$i" ] && [ ! -d "$i" ]; then
@@ -60,21 +60,13 @@ build() {
 		fi
 	done
 
-	rm \
-		$PKG/usr/lib{,32}/libstdc++.so.6.0.21-gdb.py \
-		$PKG/usr/bin/*-linux-gnu-*
-
-	rm -r \
-		$PKG/usr/share/man/man7 \
-		$PKG/usr/share/info \
-		$PKG/usr/share/gcc-5.4.?/python \
-		$PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
+	rm $PKG/usr/bin/*-linux-gnu-*
+	rm -r $PKG/usr/share/{info,gcc-$version}
+	rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
 
 	# Remove empty directories
 	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
-		sed -i "s|-L$SRC[^ ]* ||g" $PKG/$i
-	done
+	sed -i -e "s|-L$SRC[^ ]* ||g" $PKG/usr/lib{,32}/libgfortran.la
 }