islversion 0.24, hopefully adafix

2 files changed, 51 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e7568bd89d2..2b8df9804107 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gcc-11
 	pkgdesc = The GNU Compiler Collection
 	pkgver = 11.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gcc.gnu.org
 	arch = x86_64
 	license = GPL
@@ -20,25 +20,23 @@ pkgbase = gcc-11
 	makedepends = git
 	options = !emptydirs
 	source = https://sourceware.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz
-	source = https://sourceware.org/pub/gcc/releases/gcc-11.1.0/gcc-11.1.0.tar.xz.sig
-	source = http://isl.gforge.inria.fr/isl-0.23.tar.xz
+	source = http://isl.gforge.inria.fr/isl-0.24.tar.xz
 	source = c89
 	source = c99
 	b2sums = fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed
-	b2sums = SKIP
-	b2sums = ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b
+	b2sums = 39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d
 	b2sums = 2c64090b879d6faea7f20095eff1b9bd6a09fe3b15b3890783d3715171678ab62d32c91af683b878746fb14441dbe09768474417840f96a561443415f76afb63
 	b2sums = 3cf318835b9833ac7c5d3a6026fff8b4f18b098e18c9649d00e32273688ff06ec3af41f0d0aee9d2261725e0ff08f47a224ccfe5ebb06646aaf318ff8ac9a0d1
 
 pkgname = gcc-11
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends
 	groups = base-devel
-	depends = gcc-libs=11.1.0-1
+	depends = gcc-libs=11.1.0-2
 	depends = binutils>=2.28
 	depends = libmpc
 	optdepends = lib32-gcc-libs: for generating code for 32-bit ABI
-	provides = gcc-multilib=11.1.0-1
-	provides = gcc=11.1.0-1
+	provides = gcc-multilib=11.1.0-2
+	provides = gcc=11.1.0-2
 	conflicts = gcc
 	options = !emptydirs
 	options = staticlibs
@@ -46,68 +44,68 @@ pkgname = gcc-11
 pkgname = gcc-libs-11
 	pkgdesc = Runtime libraries shipped by GCC
 	depends = glibc>=2.27
-	provides = gcc-libs-multilib=11.1.0-1
-	provides = libgo.so=11.1.0-1
-	provides = libgfortran.so=11.1.0-1
-	provides = libgphobos.so=11.1.0-1
-	provides = libubsan.so=11.1.0-1
-	provides = libasan.so=11.1.0-1
-	provides = libtsan.so=11.1.0-1
-	provides = liblsan.so=11.1.0-1
-	provides = gcc-libs=11.1.0-1
+	provides = gcc-libs-multilib=11.1.0-2
+	provides = libgo.so=11.1.0-2
+	provides = libgfortran.so=11.1.0-2
+	provides = libgphobos.so=11.1.0-2
+	provides = libubsan.so=11.1.0-2
+	provides = libasan.so=11.1.0-2
+	provides = libtsan.so=11.1.0-2
+	provides = liblsan.so=11.1.0-2
+	provides = gcc-libs=11.1.0-2
 	conflicts = gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-fortran-11
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc=11.1.0-1
-	provides = gcc-fortran-multilib=11.1.0-1
-	provides = gcc-fortran=11.1.0-1
+	depends = gcc=11.1.0-2
+	provides = gcc-fortran-multilib=11.1.0-2
+	provides = gcc-fortran=11.1.0-2
 	conflicts = gcc-fortran
 
 pkgname = gcc-objc-11
 	pkgdesc = Objective-C front-end for GCC
-	depends = gcc=11.1.0-1
-	provides = gcc-objc-multilib=11.1.0-1
-	provides = gcc-objc=11.1.0-1
+	depends = gcc=11.1.0-2
+	provides = gcc-objc-multilib=11.1.0-2
+	provides = gcc-objc=11.1.0-2
 	conflicts = gcc-objc
 
 pkgname = gcc-ada-11
 	pkgdesc = Ada front-end for GCC (GNAT)
-	depends = gcc=11.1.0-1
-	provides = gcc-ada-multilib=11.1.0-1
-	provides = gcc-ada=11.1.0-1
+	depends = gcc=11.1.0-2
+	provides = gcc-ada-multilib=11.1.0-2
+	provides = gcc-ada=11.1.0-2
 	conflicts = gcc-ada
 	options = !emptydirs
 	options = staticlibs
 
 pkgname = gcc-go-11
 	pkgdesc = Go front-end for GCC
-	depends = gcc=11.1.0-1
+	depends = gcc=11.1.0-2
 	provides = go=1.12.2
-	provides = gcc-go-multilib=11.1.0-1
-	provides = gcc-go=11.1.0-1
+	provides = gcc-go-multilib=11.1.0-2
+	provides = gcc-go=11.1.0-2
 	conflicts = go
 	conflicts = gcc-go
 
 pkgname = lib32-gcc-libs-11
 	pkgdesc = 32-bit runtime libraries shipped by GCC
 	depends = lib32-glibc>=2.27
-	provides = libgo.so=11.1.0-1
-	provides = libgfortran.so=11.1.0-1
-	provides = libubsan.so=11.1.0-1
-	provides = libasan.so=11.1.0-1
-	provides = lib32-gcc-libs=11.1.0-1
+	provides = libgo.so=11.1.0-2
+	provides = libgfortran.so=11.1.0-2
+	provides = libubsan.so=11.1.0-2
+	provides = libasan.so=11.1.0-2
+	provides = lib32-gcc-libs=11.1.0-2
 	conflicts = lib32-gcc-libs
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-d-11
 	pkgdesc = D frontend for GCC
-	depends = gcc=11.1.0-1
-	provides = gdc=11.1.0-1
-	provides = gcc-d=11.1.0-1
+	depends = gcc=11.1.0-2
+	provides = gdc=11.1.0-2
+	provides = gcc-d=11.1.0-2
 	conflicts = gcc-d
 	options = staticlibs
 
diff --git a/PKGBUILD b/PKGBUILD
index c0b23a6eaf3d..0574032d1105 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=(gcc-11 gcc-libs-11 gcc-fortran-11 gcc-objc-11 gcc-ada-11 gcc-go-11 lib32-gcc-libs-11 gcc-d-11)
 pkgver=11.1.0
-_majorver=${pkgver%%+*}
-_islver=0.23
-pkgrel=1
+_majorver=${pkgver}
+_islver=0.24
+pkgrel=2
 pkgdesc='The GNU Compiler Collection'
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
@@ -13,14 +13,13 @@ url='https://gcc.gnu.org'
 makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-_libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
-source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz{,.sig}
+_libdir=usr/lib/gcc/$CHOST/11.1.0
+source=(https://sourceware.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz
         http://isl.gforge.inria.fr/isl-${_islver}.tar.xz
         c89 c99
 )
 b2sums=('fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed'
-        'SKIP'
-        'ce026eaa1d6c814f4067c555d97a453bdf01d5fa240aa9b6ccd22c9a0e7f19b0c30cd834f976a29b10a5d57eaa747a3f45cf55717f05d98ae405ec93dd42f27b'
+        '39cbfd18ad05778e3a5a44429261b45e4abc3efe7730ee890674d968890fe5e52c73bc1f8d271c7c3bc72d5754e3f7fcb209bd139e823d19cb9ea4ce1440164d'
         '2c64090b879d6faea7f20095eff1b9bd6a09fe3b15b3890783d3715171678ab62d32c91af683b878746fb14441dbe09768474417840f96a561443415f76afb63'
         '3cf318835b9833ac7c5d3a6026fff8b4f18b098e18c9649d00e32273688ff06ec3af41f0d0aee9d2261725e0ff08f47a224ccfe5ebb06646aaf318ff8ac9a0d1')
 
@@ -297,16 +296,16 @@ package_gcc-ada-11() {
   ln -s gcc "$pkgdir/usr/bin/gnatgcc"
 
   # insist on dynamic linking, but keep static libraries because gnatmake complains
-  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib"
-  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib/libgnarl.so"
-  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib/libgnat.so"
-  rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
-
-  install -d "$pkgdir/usr/lib32/"
-  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib32"
-  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib32/libgnarl.so"
-  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib32/libgnat.so"
-  rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
+#  mv "$pkgdir"/${_libdir}/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib"
+#  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib/libgnarl.so"
+#  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib/libgnat.so"
+#  rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
+
+#  install -d "$pkgdir/usr/lib32/"
+#  mv "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}-${_majorver}.so "$pkgdir/usr/lib32"
+#  ln -s libgnarl-${_majorver}.so "$pkgdir/usr/lib32/libgnarl.so"
+#  ln -s libgnat-${_majorver}.so "$pkgdir/usr/lib32/libgnat.so"
+#  rm -f "$pkgdir"/${_libdir}/32/adalib/libgna{rl,t}.so
 
   # Install Runtime Library Exception
   install -d "$pkgdir/usr/share/licenses/$pkgname/"