Drop gcc8 from [community]

PKGBUILD:
gcc8 is no longer required by any other package in the official
repositories.

2 files changed, 63 insertions, 141 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f93351341c56..bbdba0cc0b1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,32 @@
 pkgbase = gcc8
-	pkgdesc = The GNU Compiler Collection
-	pkgver = 8.3.0
-	pkgrel = 1
-	url = https://gcc.gnu.org
+	pkgdesc = The GNU Compiler Collection (8.x.x)
+	pkgver = 8.4.0
+	pkgrel = 2
+	url = http://gcc.gnu.org
 	arch = x86_64
 	license = GPL
 	license = LGPL
 	license = FDL
 	license = custom
+	checkdepends = dejagnu
+	checkdepends = inetutils
 	makedepends = binutils
 	makedepends = libmpc
 	makedepends = doxygen
-	makedepends = lib32-glibc
-	makedepends = lib32-gcc-libs
 	makedepends = python
 	options = !emptydirs
-	source = https://ftp.gnu.org/gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz
-	source = http://isl.gforge.inria.fr/isl-0.21.tar.xz
-	source = c89
-	source = c99
-	sha256sums = 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
-	sha256sums = 777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960
-	sha256sums = 1ec3372373d0e20b9f32057c0e90ad776086f5d407b388b78b9699a272bf5a3f
-	sha256sums = 30e17222514da5a225272aca3da79bdf3e088656a6a00a7cc6ceab91bea1e032
+	source = https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz
+	source = https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz.sig
+	source = http://isl.gforge.inria.fr/isl-0.21.tar.bz2
+	validpgpkeys = 13975A70E63C361C73AE69EF6EEB81F8981C74C7
+	validpgpkeys = 33C235A34C46AA3FFB293709A328C3A2C3C45C06
+	sha256sums = e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4
+	sha256sums = SKIP
+	sha256sums = d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859
 
 pkgname = gcc8
-	pkgdesc = The GNU Compiler Collection - C and C++ frontends
-	depends = gcc8-libs=8.3.0-1
+	pkgdesc = The GNU Compiler Collection - C and C++ frontends (8.x.x)
+	depends = gcc8-libs=8.4.0-2
 	depends = binutils>=2.28
 	depends = libmpc
 	options = !emptydirs
@@ -40,15 +40,5 @@ pkgname = gcc8-libs
 
 pkgname = gcc8-fortran
 	pkgdesc = Fortran front-end for GCC (8.x.x)
-	depends = gcc8=8.3.0-1
-
-pkgname = gcc8-objc
-	pkgdesc = Objective-C front-end for GCC (8.x.x)
-	depends = gcc8=8.3.0-1
-
-pkgname = gcc8-go
-	pkgdesc = Go front-end for GCC (8.x.x)
-	depends = gcc8=8.3.0-1
-	provides = go=1.10.1
-	conflicts = go
+	depends = gcc8=8.4.0-2
 
diff --git a/PKGBUILD b/PKGBUILD
index f5f07588bf61..49c1a80db8b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,30 @@
-# Maintainer: Jingbei Li <i@jingbei.li>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: Sven-Hendrik Haase <svenstaro@gmail.com>
+# Contributor:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
-pkgbase=gcc8
-pkgname=(gcc8 gcc8-libs gcc8-fortran gcc8-objc gcc8-go)
-pkgver=8.3.0
-_ver=8
+
+pkgname=(gcc8 gcc8-libs gcc8-fortran)
+pkgver=8.4.0
+_pkgver=8
 _majorver=${pkgver:0:1}
 _islver=0.21
-pkgrel=1
-pkgdesc='The GNU Compiler Collection'
+pkgrel=2
+pkgdesc='The GNU Compiler Collection (8.x.x)'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
-url='https://gcc.gnu.org'
-makedepends=(binutils libmpc doxygen lib32-glibc lib32-gcc-libs python)
-#checkdepends=(dejagnu inetutils)
+url='http://gcc.gnu.org'
+makedepends=(binutils libmpc doxygen python)
+checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-source=("https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz"
-        "http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
-        "c89" "c99")
-sha256sums=('64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c'
-            '777058852a3db9500954361e294881214f6ecd4b594c00da5eee974cd6a54960'
-            '1ec3372373d0e20b9f32057c0e90ad776086f5d407b388b78b9699a272bf5a3f'
-            '30e17222514da5a225272aca3da79bdf3e088656a6a00a7cc6ceab91bea1e032')
+source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
+validpgpkeys=(13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
+              33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
+sha256sums=('e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4'
+            'SKIP'
+            'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859')
 
 _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
 
@@ -59,8 +58,10 @@ build() {
   "$srcdir/gcc/configure" --prefix=/usr \
       --libdir=/usr/lib \
       --libexecdir=/usr/lib \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
       --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,fortran,go,lto,objc,obj-c++ \
+      --enable-languages=c,c++,fortran,lto \
       --enable-shared \
       --enable-threads=posix \
       --enable-libmpx \
@@ -84,18 +85,22 @@ build() {
       --enable-default-pie \
       --enable-default-ssp \
       --enable-cet=auto \
-      --program-suffix=-${_ver}
+      --program-suffix=-${_pkgver} \
+      --enable-version-specific-runtime-libs
 
   make
+
+  # make documentation
+  make -C $CHOST/libstdc++-v3/doc doc-man-doxygen
 }
 
-#check() {
-#  cd gcc-build
-#
-#  # do not abort on error as some are "expected"
-#  make -k check || true
-#  "$srcdir/gcc/contrib/test_summary"
-#}
+check() {
+  cd gcc-build
+
+  # do not abort on error as some are "expected"
+  make -k check || true
+  "$srcdir/gcc/contrib/test_summary"
+}
 
 package_gcc8-libs() {
   pkgdesc='Runtime libraries shipped by GCC (8.x.x)'
@@ -104,12 +109,12 @@ package_gcc8-libs() {
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
+  mv "$pkgdir"/$_libdir/../lib/* "$pkgdir"/$_libdir
+  rmdir "$pkgdir"/$_libdir/../lib
   rm -f "$pkgdir/$_libdir/libgcc_eh.a"
-  mv ${pkgdir}/usr/lib/libgcc_s.so* $pkgdir/$_libdir
 
   for lib in libatomic \
              libgfortran \
-             libgo \
              libgomp \
              libitm \
              libquadmath \
@@ -119,22 +124,16 @@ package_gcc8-libs() {
     make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
   done
 
-  make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
   make -C $CHOST/libmpx DESTDIR="$pkgdir" install
-  rm -f "$pkgdir/usr/lib/libmpx.spec"
-
-  find ${pkgdir}/usr/lib/ -not -type d -maxdepth 1 -exec mv {} $pkgdir/$_libdir \;
-
-  # remove files provided by lib32-gcc-libs
-  rm -rf "$pkgdir"/usr/lib32/
+  rm -f "$pkgdir/${_libdir}/libmpx.spec"
 
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
-    "$pkgdir/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
+    "$pkgdir/usr/share/licenses/gcc8-libs/RUNTIME.LIBRARY.EXCEPTION"
 }
 
 package_gcc8() {
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends (8.x.x)"
   depends=("gcc8-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
   options+=(staticlibs)
 
@@ -143,37 +142,21 @@ package_gcc8() {
   make -C gcc DESTDIR="$pkgdir" install-driver install-cpp install-gcc-ar \
     c++.install-common install-headers install-plugin install-lto-wrapper
 
-  for i in gcov gcov-tool
-  do
-    install -m755 gcc/$i "$pkgdir/usr/bin/$i-${_ver}"
-  done
-
-  for i in cc1 cc1plus collect2 lto1
-  do
-    install -m755 gcc/$i "$pkgdir/${_libdir}/${i}-${_ver}"
-  done
+  install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1,gcov,gcov-tool}
 
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install
-  rm -f "$pkgdir"/usr/lib/libgcc_s.so*
+  rm -r "$pkgdir"/${_libdir}/../lib
 
   make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
   make -C $CHOST/libstdc++-v3/python DESTDIR="$pkgdir" install
-
-  make DESTDIR="$pkgdir" install-libcc1
-  install -d "$pkgdir/usr/share/gdb/auto-load/usr/lib"
-  #mv "$pkgdir"/usr/lib/libstdc++.so.6.*-gdb.py \
-  #  "$pkgdir/usr/share/gdb/auto-load/usr/lib/"
-  rm "$pkgdir"/usr/lib/libstdc++.so*
+  rm "$pkgdir"/${_libdir}/libstdc++.so*
 
   make DESTDIR="$pkgdir" install-fixincludes
   make -C gcc DESTDIR="$pkgdir" install-mkheaders
 
   make -C lto-plugin DESTDIR="$pkgdir" install
-  install -dm755 "$pkgdir"/usr/lib/bfd-plugins/
-  ln -s /${_libdir}/liblto_plugin.so \
-    "$pkgdir/usr/lib/bfd-plugins/"
 
   make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_{libsubinclude,toolexeclib}HEADERS
   make -C $CHOST/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
@@ -184,16 +167,10 @@ package_gcc8() {
   make -C $CHOST/libsanitizer/lsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/libmpx DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
 
-  find ${pkgdir}/usr/lib/ -not -type d -maxdepth 1 -exec mv {} $pkgdir/$_libdir \;
-
   make -C libcpp DESTDIR="$pkgdir" install
 
   # many packages expect this symlink
-  ln -s gcc-${_ver} ${pkgdir}/usr/bin/cc-${_ver}
-
-  # POSIX conformance launcher scripts for c89 and c99
-  install -Dm755 "$srcdir/c89" "$pkgdir/usr/bin/c89-${_ver}"
-  install -Dm755 "$srcdir/c99" "$pkgdir/usr/bin/c99-${_ver}"
+  ln -s gcc-8 "$pkgdir"/usr/bin/cc-8
 
   # byte-compile python libraries
   python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
@@ -204,11 +181,8 @@ package_gcc8() {
   ln -s /usr/share/licenses/gcc8-libs/RUNTIME.LIBRARY.EXCEPTION \
     "$pkgdir/usr/share/licenses/$pkgname/"
 
-  # Lazy way of dealing with conflicting files ...
-  rm -rf ${pkgdir}/usr/share/{info,locale,man}
-
-  # Move potentially conflicting stuff to version specific subdirectory
-  mv $pkgdir/usr/lib/bfd-plugins/liblto_plugin.so ${pkgdir}/usr/lib/bfd-plugins/liblto_plugin-${_ver}.so
+  # Remove conflicting files
+  rm -r "$pkgdir"/usr/share/locale
 }
 
 package_gcc8-fortran() {
@@ -221,53 +195,11 @@ package_gcc8-fortran() {
   make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
   make -C gcc DESTDIR="$pkgdir" fortran.install-common
   install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
-  rm -f "$pkgdir/usr/lib/libgfortran.spec"
-
-  ln -s gfortran-${_ver} "$pkgdir/usr/bin/f95-${_ver}"
-
-  # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/$pkgname/"
-  ln -s /usr/share/licenses/gcc8-libs/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/$pkgname/"
-}
 
-package_gcc8-objc() {
-  pkgdesc='Objective-C front-end for GCC (8.x.x)'
-  depends=("gcc8=$pkgver-$pkgrel")
-
-  cd gcc-build
-  make DESTDIR="$pkgdir" -C $CHOST/libobjc install-headers
-  install -dm755 "$pkgdir/${_libdir}"
-  install -m755 gcc/cc1obj{,plus} "$pkgdir/${_libdir}/"
+  ln -s gfortran-8 "$pkgdir/usr/bin/f95-8"
 
   # Install Runtime Library Exception
   install -d "$pkgdir/usr/share/licenses/$pkgname/"
-  ln -s /usr/share/licenses/gcc8-libs/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/$pkgname/"
-}
-
-package_gcc8-go() {
-  pkgdesc='Go front-end for GCC (8.x.x)'
-  depends=("gcc8=$pkgver-$pkgrel")
-  provides=("go=1.10.1")
-  conflicts=(go)
-
-  cd gcc-build
-  make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
-  make DESTDIR="$pkgdir" install-gotools
-  make -C gcc DESTDIR="$pkgdir" go.install-common
-
-  rm -f "$pkgdir"/usr/lib/libgo.so*
-  install -Dm755 gcc/go1 "$pkgdir/${_libdir}/go1"
-
-  _libdir=usr/lib/go/${pkgver%%+*}/$CHOST
-  find ${pkgdir}/usr/lib/ -not -type d -maxdepth 1 -exec mv {} $pkgdir/${_libdir} \;
-
-  # Lazy way of dealing with conflicting files ...
-  rm -rf ${pkgdir}/usr/share/{info,locale,man}
-
-  # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/$pkgname/"
-  ln -s /usr/share/licenses/gcc8-libs/RUNTIME.LIBRARY.EXCEPTION \
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
     "$pkgdir/usr/share/licenses/$pkgname/"
 }