Update to 11.2.0, fix ISL path, other small fixes

1 files changed, 9 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 58db5cbd0248..8e63db8a0005 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _target=mips64-elf
 pkgname=${_target}-gcc
-pkgver=11.1.0
+pkgver=11.2.0
 _islver=0.24
 pkgrel=1
 pkgdesc="The GNU Compiler Collection (${_target})"
@@ -12,14 +12,14 @@ license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://www.gnu.org/software/gcc/"
 depends=('libmpc' 'zstd' "${_target}-newlib")
 makedepends=('gmp' 'mpfr' "${_target}-binutils")
-options=('!emptydirs' '!distcc' '!strip')
+options=('!emptydirs' '!strip')
 conflicts=("${_target}-gcc-stage1")
 provides=("${_target}-gcc-stage1")
 replaces=("${_target}-gcc-stage1")
 source=("http://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
-        "http://isl.gforge.inria.fr/isl-${_islver}.tar.xz"
+        "https://libisl.sourceforge.io/isl-${_islver}.tar.xz"
         "mabi32.patch")
-sha256sums=('4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf'
+sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
             '043105cc544f416b48736fff8caf077fb0663a717d06b1113f16e391ac99ebad'
             '86c06dfb12295e665204441ca17440d4e597da24b6cffad052c94268ec562169')
 
@@ -37,10 +37,12 @@ prepare() {
 
   # patch multilib support for mabi=32
   patch --strip=1 --input="${srcdir}"/mabi32.patch
+
+  rm -rf "$srcdir"/build-gcc
+  mkdir "$srcdir"/build-gcc
 }
 
 build() {
-  mkdir -p "${srcdir}"/build-gcc
   cd build-gcc
 
   CFLAGS=${CFLAGS/-Werror=format-security/}
@@ -88,16 +90,8 @@ build() {
 package() {
   cd build-gcc
 
-  make DESTDIR="${pkgdir}" install -j1
-
-  # strip target binaries
-  find "$pkgdir"/usr/lib/gcc/$_target/$pkgver "$pkgdir"/usr/$_target/lib -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \;
-
-  # strip host binaries
-  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/$pkgver -type f -and \( -executable \) -exec strip '{}' \;
+  make install-strip DESTDIR="${pkgdir}"
 
   # Remove files that conflict with host gcc package
-  rm -r "$pkgdir"/usr/share/man/man7
-  rm -r "$pkgdir"/usr/share/info
-  rm "$pkgdir"/usr/lib/libcc1.*
+  rm -r "$pkgdir"/usr/{include,lib/libcc*,share}
 }