[arch-commits] Commit in gcc/trunk (PKGBUILD bz84080.patch)

[Bartłomiej Piotrowski]

    Date: Wednesday, May 2, 2018 @ 20:16:58
  Author: bpiotrowski
Revision: 323294

8.1.0-1

Modified:
  gcc/trunk/PKGBUILD
Deleted:
  gcc/trunk/bz84080.patch

---------------+
 PKGBUILD      |   27 ++++++++++-----------------
 bz84080.patch |   27 ---------------------------
 2 files changed, 10 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-02 19:53:08 UTC (rev 323293)
+++ PKGBUILD	2018-05-02 20:16:58 UTC (rev 323294)
@@ -6,7 +6,7 @@
 # NOTE: libtool requires rebuilt with each new gcc version
 
 pkgname=(gcc gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go lib32-gcc-libs)
-pkgver=7.3.1+20180406
+pkgver=8.1.0
 _majorver=${pkgver:0:1}
 _islver=0.18
 pkgrel=1
@@ -17,19 +17,18 @@
 makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-#source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
-source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
+#source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig}
+source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
         http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        c89 c99
-        bz84080.patch)
+        c89 c99)
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski at archlinux.org
-              13975A70E63C361C73AE69EF6EEB81F8981C74C7) # richard.guenther at gmail.com
-sha256sums=('41675861b7fdb4ebfb5cbbe1bce456d4e4061ce4df95096075756eaae3263e00'
+              13975A70E63C361C73AE69EF6EEB81F8981C74C7  # richard.guenther at gmail.com
+              33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub at redhat.com>
+sha256sums=('1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153'
             'SKIP'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
             'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
-            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
-            'bce05807443558db55f0d6b4dae37a678ea1bb3388b541c876fe3d110e3717e7')
+            '2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a')
 
 _svnrev=259195
 _svnurl=svn://gcc.gnu.org/svn/gcc/branches/gcc-${_majorver}-branch
@@ -57,9 +56,6 @@
   [[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
   cd gcc
 
-  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84080
-  patch -p0 -i "$srcdir/bz84080.patch"
-
   # link isl for in-tree build
   ln -s ../isl-${_islver} isl
 
@@ -132,7 +128,7 @@
   groups=(base)
   depends=('glibc>=2.27')
   options+=(!strip)
-  provides=($pkgname-multilib libgo.so libgfortran.so)
+  provides=($pkgname-multilib libgo.so libgfortran.so libubsan.so libasan.so)
   replaces=($pkgname-multilib)
 
   cd gcc-build
@@ -140,7 +136,6 @@
   rm -f "$pkgdir/$_libdir/libgcc_eh.a"
 
   for lib in libatomic \
-             libcilkrts \
              libgfortran \
              libgo \
              libgomp \
@@ -214,7 +209,6 @@
   ln -s /${_libdir}/liblto_plugin.so \
     "$pkgdir/usr/lib/bfd-plugins/"
 
-  make -C $CHOST/libcilkrts DESTDIR="$pkgdir" install-nodist_{toolexeclib,cilkinclude}HEADERS
   make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_{libsubinclude,toolexeclib}HEADERS
   make -C $CHOST/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/libquadmath DESTDIR="$pkgdir" install-nodist_libsubincludeHEADERS
@@ -221,7 +215,6 @@
   make -C $CHOST/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
   make -C $CHOST/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/libmpx DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
-  make -C $CHOST/32/libcilkrts DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/32/libgomp DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/32/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
   make -C $CHOST/32/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
@@ -361,6 +354,7 @@
 package_lib32-gcc-libs() {
   pkgdesc='32-bit runtime libraries shipped by GCC'
   depends=('lib32-glibc>=2.27')
+  provides=(libgo.so libgfortran.so libubsan.so libasan.so)
   groups=(multilib-devel)
   options=(!emptydirs !strip)
 
@@ -370,7 +364,6 @@
   rm -f "$pkgdir/$_libdir/32/libgcc_eh.a"
 
   for lib in libatomic \
-             libcilkrts \
              libgfortran \
              libgo \
              libgomp \

Deleted: bz84080.patch
===================================================================
--- bz84080.patch	2018-05-02 19:53:08 UTC (rev 323293)
+++ bz84080.patch	2018-05-02 20:16:58 UTC (rev 323294)
@@ -1,27 +0,0 @@
-Index: gcc/testsuite/g++.dg/cpp1y/auto-fn47.C
-===================================================================
---- gcc/testsuite/g++.dg/cpp1y/auto-fn47.C	(nonexistent)
-+++ gcc/testsuite/g++.dg/cpp1y/auto-fn47.C	(revision 257630)
-@@ -0,0 +1,6 @@
-+// PR c++/84080
-+// { dg-do compile { target c++14 } }
-+
-+template <int i, typename T> T foo();
-+
-+template <> auto foo<0>() { return 42; } // { dg-error "does not match" }
-Index: gcc/cp/pt.c
-===================================================================
---- gcc/cp/pt.c	(revision 257629)
-+++ gcc/cp/pt.c	(revision 257630)
-@@ -2203,6 +2203,11 @@
- 	       specialize TMPL will produce DECL.  */
- 	    continue;
- 
-+	  if (uses_template_parms (targs))
-+	    /* We deduced something involving 'auto', which isn't a valid
-+	       template argument.  */
-+	    continue;
-+
-           /* Remove, from the set of candidates, all those functions
-              whose constraints are not satisfied. */
-           if (flag_concepts && !constraints_satisfied_p (fn, targs))