Enabled Fortran support to be closer to the "gcc" package.

(Before the change, it failed to install if "gcc-fortran" is installed.)

2 files changed, 45 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eda4f7d9a268..f2e9b5016800 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu May  2 01:25:00 UTC 2019
+# Thu May  2 23:38:00 UTC 2019
 pkgbase = gcc-multilib-trunk-git
 	pkgdesc = The GNU Compiler Collection developmental snapshot
-	pkgver = 10.0.0.r168552.ade32724c83
+	pkgver = 10.0.0.r168586.9766cefe693
 	pkgrel = 1
 	url = http://gcc.gnu.org
 	arch = any
@@ -24,11 +24,11 @@ pkgname = gcc-multilib-git
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends for multilib
 	install = gcc.install
 	groups = multilib-devel
-	depends = gcc-libs-multilib-git=10.0.0.r168552.ade32724c83-1
+	depends = gcc-libs-multilib-git=10.0.0.r168586.9766cefe693-1
 	depends = binutils>=2.25
 	depends = libmpc
-	provides = gcc=10.0.0.r168552.ade32724c83-1
-	provides = gcc-multilib=10.0.0.r168552.ade32724c83-1
+	provides = gcc=10.0.0.r168586.9766cefe693-1
+	provides = gcc-multilib=10.0.0.r168586.9766cefe693-1
 	conflicts = gcc
 	options = staticlibs
 
@@ -36,9 +36,9 @@ pkgname = gcc-libs-multilib-git
 	pkgdesc = Runtime libraries shipped by GCC for multilib
 	install = gcc-libs.install
 	depends = glibc>=2.20
-	depends = lib32-gcc-libs-git=10.0.0.r168552.ade32724c83-1
-	provides = gcc-libs=10.0.0.r168552.ade32724c83-1
-	provides = gcc-libs-multilib=10.0.0.r168552.ade32724c83-1
+	depends = lib32-gcc-libs-git=10.0.0.r168586.9766cefe693-1
+	provides = gcc-libs=10.0.0.r168586.9766cefe693-1
+	provides = gcc-libs-multilib=10.0.0.r168586.9766cefe693-1
 	conflicts = gcc-libs
 	options = !emptydirs
 	options = !strip
@@ -46,14 +46,23 @@ pkgname = gcc-libs-multilib-git
 pkgname = lib32-gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC (32-bit)
 	depends = lib32-glibc>=2.20
-	provides = lib32-gcc-libs=10.0.0.r168552.ade32724c83-1
+	provides = lib32-gcc-libs=10.0.0.r168586.9766cefe693-1
 	conflicts = lib32-gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-objc-multilib-git
 	pkgdesc = Objective-C front-end for GCC for multilib
-	depends = gcc-multilib-git=10.0.0.r168552.ade32724c83-1
-	provides = gcc-objc=10.0.0.r168552.ade32724c83-1
+	depends = gcc-multilib-git=10.0.0.r168586.9766cefe693-1
+	provides = gcc-objc=10.0.0.r168586.9766cefe693-1
 	conflicts = gcc-objc
 
+pkgname = gcc-fortran-multilib-git
+	pkgdesc = Fortran front-end for GCC for multilib
+	depends = gcc-multilib-git=10.0.0.r168586.9766cefe693-1
+	provides = gcc-fortran-multilib=10.0.0.r168586.9766cefe693-1
+	provides = gcc-fortran=10.0.0.r168586.9766cefe693-1
+	conflicts = gcc-fortran
+	options = !emptydirs
+	options = !strip
+
diff --git a/PKGBUILD b/PKGBUILD
index 6a068c4e4643..66991cc1f808 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Philipp Claßen <philipp.classen@posteo.de>
 
 pkgbase="gcc-multilib-trunk-git"
-pkgname=('gcc-multilib-git' 'gcc-libs-multilib-git' 'lib32-gcc-libs-git' 'gcc-objc-multilib-git')
-pkgver=10.0.0.r168552.ade32724c83
+pkgname=('gcc-multilib-git' 'gcc-libs-multilib-git' 'lib32-gcc-libs-git' 'gcc-objc-multilib-git' 'gcc-fortran-multilib-git')
+pkgver=10.0.0.r168586.9766cefe693
 _pkgver_base=10.0.0
 pkgrel=1
 pkgdesc="The GNU Compiler Collection developmental snapshot"
@@ -63,7 +63,7 @@ build() {
         --libdir=/usr/lib --libexecdir=/usr/lib \
         --mandir=/usr/share/man --infodir=/usr/share/info \
         --with-bugurl=https://bugs.archlinux.org/ \
-        --enable-languages=c,c++,lto,objc,obj-c++ \
+        --enable-languages=c,c++,fortran,lto,objc,obj-c++ \
         --enable-shared --enable-threads=posix \
         --with-system-zlib --enable-__cxa_atexit \
         --disable-libunwind-exceptions --enable-clocale=gnu \
@@ -202,6 +202,28 @@ EOF
         ln -s ../gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-multilib/
 }
 
+package_gcc-fortran-multilib-git() {
+  pkgdesc='Fortran front-end for GCC for multilib'
+  depends=("gcc-multilib-git=$pkgver-$pkgrel")
+  provides=("gcc-fortran-multilib=${pkgver}-${pkgrel}" "gcc-fortran=${pkgver}-${pkgrel}")
+  conflicts=('gcc-fortran')
+  options=('!emptydirs' '!strip')
+
+  cd "${srcdir}/gcc-build"
+  make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
+    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+  make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
+    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+  make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
+  make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
+  install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
+
+  ln -s gfortran "$pkgdir/usr/bin/f95"
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir/usr/share/licenses/gcc-fortran-multilib/"
+  ln -s ../gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION "$pkgdir/usr/share/licenses/gcc-fortran-multilib/"
+}
 
 package_gcc-libs-multilib-git()
 {