Use latest git commit

1 files changed, 103 insertions, 89 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bf6850b4dbe2..5d6cc8898daf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,31 @@
-# Original Core Repo
-# ==================
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
-
-# Modifications to use source from git master
-# Maintainer: James P. Harvey <jamespharvey20 at gmail dot com>
-#    * This PKGBUILD as closely as possible matches core's gcc 9.2.0
+# Contributor: Daniel Kozak <kozzi11@gmail.com>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
 
-pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-gitb)
-pkgver=10.0.0.r172005.fcab78b9b34
+pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git lib32-gcc-libs-gitb gcc-d-git)
+pkgver=10.1.0
 _majorver=${pkgver%%.*}
-#this is set after pkgver() runs!  (Thanks makepkg!)
-_basever=${pkgver%%.r*}
-_islver=0.21
-pkgrel=1
-pkgdesc='The GNU Compiler Collection (git version)'
+_islver=0.22.1
+pkgrel=2
+pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
 makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-#source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
-source=(git+https://gcc.gnu.org/git/gcc.git#commit=fcab78b9
-        https://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        c89 c99)
-validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.org
-              86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos@foutrelis.com
-              13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther@gmail.com
-              33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@redhat.com>
-sha256sums=('SKIP'
-            'd18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859'
-            'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
-
-_svnrev=264010
-_svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
-#also set after pkgver() runs!
-_libdir=usr/lib/gcc/$CHOST/${_basever}
-
-# snapshot() is only used by core's maintainers, so removing it here
+_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
+source=(git+https://gcc.gnu.org/git/gcc.git
+        http://isl.gforge.inria.fr/isl-${_islver}.tar.xz
+        c89 c99
+)
+sha512sums=('SKIP'
+            '8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa'
+            '25f0e186388075e25c80c2322865e948f22678f6769886d30c09204eb0e7efd6653170b62e749ece674d0814843609be75a096fd54bb65a87fa4037cf2889d03'
+            'a0589368eb84611e2fd7397c619b7f13700bfac8018a45c35bd1c0c3d59a2782609cb9d8d090696586ea721c6d93dca6f7f6c689ac729341ee62e035b1d5af14')
 
 pkgver() {
   cd gcc
@@ -50,8 +33,6 @@ pkgver() {
 }
 
 prepare() {
-  #unlike a tarball, git clone will name the directory gcc
-  #[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
   cd gcc
 
   # link isl for in-tree build
@@ -77,39 +58,36 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  #Revsion 261304 removed libmpx
-  #https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=261304
-  #https://gcc.gnu.org/wiki/Intel%20MPX%20support%20in%20the%20GCC%20compiler
-  #https://www.phoronix.com/scan.php?page=news_item&px=MPX-Removed-From-GCC9
   "$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++,ada,fortran,go,lto,objc,obj-c++ \
-      --enable-shared \
-      --enable-threads=posix \
-      --with-system-zlib \
+      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++,d \
       --with-isl \
+      --with-linker-hash-style=gnu \
+      --with-system-zlib \
       --enable-__cxa_atexit \
-      --disable-libunwind-exceptions \
+      --enable-cet=auto \
+      --enable-checking=release \
       --enable-clocale=gnu \
-      --disable-libstdcxx-pch \
-      --disable-libssp \
+      --enable-default-pie \
+      --enable-default-ssp \
+      --enable-gnu-indirect-function \
       --enable-gnu-unique-object \
+      --enable-install-libiberty \
       --enable-linker-build-id \
       --enable-lto \
-      --enable-plugin \
-      --enable-install-libiberty \
-      --with-linker-hash-style=gnu \
-      --enable-gnu-indirect-function \
       --enable-multilib \
+      --enable-plugin \
+      --enable-shared \
+      --enable-threads=posix \
+      --disable-libssp \
+      --disable-libstdcxx-pch \
+      --disable-libunwind-exceptions \
       --disable-werror \
-      --enable-checking=release \
-      --enable-default-pie \
-      --enable-default-ssp \
-      --enable-cet=auto
+      gdc_include_dir=/usr/include/dlang/gdc
 
   make
 
@@ -126,11 +104,11 @@ check() {
 }
 
 package_gcc-libs-git() {
-  pkgdesc='Runtime libraries shipped by GCC (git version)'
+  pkgdesc='Runtime libraries shipped by GCC'
   depends=('glibc>=2.27')
   options+=(!strip)
-  provides=(gcc-libs-multilib=${pkgver}-${pkgrel} libgo.so=${pkgver}-${pkgrel} libgfortran.so=${pkgver}-${pkgrel} libubsan.so=${pkgver}-${pkgrel} libasan.so=${pkgver}-${pkgrel}
-            libtsan.so=${pkgver}-${pkgrel} liblsan.so=${pkgver}-${pkgrel} gcc-libs=${pkgver}-${pkgrel})
+  provides=(gcc-libs-multilib=${pkgver}-${pkgrel} libgo.so=${pkgver}-${pkgrel} libgfortran.so=${pkgver}-${pkgrel} libgphobos.so=${pkgver}-${pkgrel}
+            libubsan.so=${pkgver}-${pkgrel} libasan.so=${pkgver}-${pkgrel} libtsan.so=${pkgver}-${pkgrel} liblsan.so=${pkgver}-${pkgrel} gcc-libs=${pkgver}-${pkgrel})
   conflicts=(gcc-libs)
 
   cd gcc-build
@@ -152,6 +130,10 @@ package_gcc-libs-git() {
   make -C $CHOST/libobjc DESTDIR="$pkgdir" install-libs
   make -C $CHOST/libstdc++-v3/po DESTDIR="$pkgdir" install
 
+  make -C $CHOST/libphobos DESTDIR="$pkgdir" install
+  rm -rf "$pkgdir"/$_libdir/include/d/
+  rm -f "$pkgdir"/usr/lib/libgphobos.spec
+
   for lib in libgomp \
              libitm \
              libquadmath; do
@@ -163,12 +145,13 @@ package_gcc-libs-git() {
 
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
-    "$pkgdir/usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION"
+    "$pkgdir/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
 }
 
 package_gcc-git() {
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends (git version)"
+  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
   depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
+  groups=('base-devel')
   optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
   provides=(gcc-multilib=${pkgver}-${pkgrel} gcc=${pkgver}-${pkgrel})
   conflicts=(gcc)
@@ -224,8 +207,8 @@ package_gcc-git() {
   install -m644 libiberty/pic/libiberty.a "$pkgdir/usr/lib"
 
   make -C gcc DESTDIR="$pkgdir" install-man install-info
-  rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran}.1
-  rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
+  rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran,gdc}.1
+  rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn,gdc}.info
 
   make -C libcpp DESTDIR="$pkgdir" install
   make -C gcc DESTDIR="$pkgdir" install-po
@@ -244,26 +227,26 @@ package_gcc-git() {
   rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
 
   # byte-compile python libraries
-  python -m compileall "$pkgdir/usr/share/gcc-${_basever}/"
-  python -O -m compileall "$pkgdir/usr/share/gcc-${_basever}/"
+  python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
+  python -O -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
 
   # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/gcc-git/"
-  ln -s /usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/gcc-git/"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_gcc-fortran-git() {
-  pkgdesc='Fortran front-end for GCC (git version)'
+  pkgdesc='Fortran front-end for GCC'
   depends=("gcc=$pkgver-$pkgrel")
   provides=(gcc-fortran-multilib=${pkgver}-${pkgrel} gcc-fortran=${pkgver}-${pkgrel})
   conflicts=(gcc-fortran)
 
   cd gcc-build
   make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
-    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+    install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
   make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
-    install-{toolexeclibDATA,nodist_fincludeHEADERS}
+    install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
   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"
@@ -271,13 +254,13 @@ package_gcc-fortran-git() {
   ln -s gfortran "$pkgdir/usr/bin/f95"
 
   # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/gcc-fortran-git/"
-  ln -s /usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/gcc-fortran-git/"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_gcc-objc-git() {
-  pkgdesc='Objective-C front-end for GCC (git version)'
+  pkgdesc='Objective-C front-end for GCC'
   depends=("gcc=$pkgver-$pkgrel")
   provides=(gcc-objc-multilib=${pkgver}-${pkgrel} gcc-objc=${pkgver}-${pkgrel})
   conflicts=(gcc-objc)
@@ -288,13 +271,13 @@ package_gcc-objc-git() {
   install -m755 gcc/cc1obj{,plus} "$pkgdir/${_libdir}/"
 
   # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/gcc-objc-git/"
-  ln -s /usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/gcc-objc-git/"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_gcc-ada-git() {
-  pkgdesc='Ada front-end for GCC (GNAT) (git version)'
+  pkgdesc='Ada front-end for GCC (GNAT)'
   depends=("gcc=$pkgver-$pkgrel")
   provides=(gcc-ada-multilib=${pkgver}-${pkgrel} gcc-ada=${pkgver}-${pkgrel})
   conflicts=(gcc-ada)
@@ -304,9 +287,11 @@ package_gcc-ada-git() {
   make DESTDIR="$pkgdir" ada.install-{common,info}
   install -m755 gnat1 "$pkgdir/${_libdir}"
 
+  cd "$srcdir"/gcc-build/$CHOST/libada
+  make DESTDIR=${pkgdir} INSTALL="install" \
+    INSTALL_DATA="install -m644" install-libada
+
   cd "$srcdir"/gcc-build/$CHOST/32/libada
-  #Revision 267034 renamed install-gnatlib to install-libada
-  #https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=267034
   make DESTDIR=${pkgdir} INSTALL="install" \
     INSTALL_DATA="install -m644" install-libada
 
@@ -325,15 +310,15 @@ package_gcc-ada-git() {
   rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
 
   # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/gcc-ada-git/"
-  ln -s /usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/gcc-ada-git/"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_gcc-go-git() {
-  pkgdesc='Go front-end for GCC (git version)'
+  pkgdesc='Go front-end for GCC'
   depends=("gcc=$pkgver-$pkgrel")
-  provides=("go=1.12.2" gcc-go-multilib gcc-go=${pkgver}-${pkgrel})
+  provides=("go=1.12.2" gcc-go-multilib=${pkgver}-${pkgrel} gcc-go=${pkgver}-${pkgrel})
   conflicts=(go gcc-go)
 
   cd gcc-build
@@ -346,13 +331,13 @@ package_gcc-go-git() {
   install -Dm755 gcc/go1 "$pkgdir/${_libdir}/go1"
 
   # Install Runtime Library Exception
-  install -d "$pkgdir/usr/share/licenses/gcc-go-git/"
-  ln -s /usr/share/licenses/gcc-libs-git/RUNTIME.LIBRARY.EXCEPTION \
-    "$pkgdir/usr/share/licenses/gcc-go-git/"
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_lib32-gcc-libs-gitb() {
-  pkgdesc='32-bit runtime libraries shipped by GCC (git version)'
+  pkgdesc='32-bit runtime libraries shipped by GCC'
   depends=('lib32-glibc>=2.27')
   provides=(libgo.so=${pkgver}-${pkgrel} libgfortran.so=${pkgver}-${pkgrel} libubsan.so=${pkgver}-${pkgrel} libasan.so=${pkgver}-${pkgrel} lib32-gcc-libs=${pkgver}-${pkgrel})
   conflicts=(lib32-gcc-libs)
@@ -377,10 +362,39 @@ package_lib32-gcc-libs-gitb() {
 
   make -C $CHOST/32/libobjc DESTDIR="$pkgdir" install-libs
 
-  # remove files provided by gcc-libs
+  make -C $CHOST/libphobos DESTDIR="$pkgdir" install
+  rm -f "$pkgdir"/usr/lib32/libgphobos.spec
+
+  # remove files provided by gcc-libs-git
   rm -rf "$pkgdir"/usr/lib
 
   # Install Runtime Library Exception
   install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
-    "$pkgdir/usr/share/licenses/lib32-gcc-libs-gitb/RUNTIME.LIBRARY.EXCEPTION"
+    "$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
+}
+
+package_gcc-d-git() {
+  pkgdesc="D frontend for GCC"
+  depends=("gcc=$pkgver-$pkgrel")
+  provides=(gdc=${pkgver}-${pkgrel} gcc-d=${pkgver}-${pkgrel})
+  conflicts=(gcc-d)
+  options=('staticlibs')
+
+  cd gcc-build
+  make -C gcc DESTDIR="$pkgdir" d.install-{common,man,info}
+
+  install -Dm755 gcc/gdc "$pkgdir"/usr/bin/gdc
+  install -Dm755 gcc/d21 "$pkgdir"/"$_libdir"/d21
+
+  make -C $CHOST/libphobos DESTDIR="$pkgdir" install
+  rm -f "$pkgdir/usr/lib/"lib{gphobos,gdruntime}.so*
+  rm -f "$pkgdir/usr/lib32/"lib{gphobos,gdruntime}.so*
+
+  install -d "$pkgdir"/usr/include/dlang
+  ln -s /"${_libdir}"/include/d "$pkgdir"/usr/include/dlang/gdc
+
+  # Install Runtime Library Exception
+  install -d "$pkgdir/usr/share/licenses/$pkgname/"
+  ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
+    "$pkgdir/usr/share/licenses/$pkgname/"
 }