From 9446781da388b3eb35eb38c82fec04a83c9fd4d8 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sat, 28 Mar 2020 17:52:46 -0300
Subject: updpkg: cross/cross-gcc 9.3.0-1

Signed-off-by: David P <megver83@parabola.nu>
---
 cross/cross-gcc/PKGBUILD | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

(limited to 'cross')

diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD
index bf712f9ba..279b64c6f 100644
--- a/cross/cross-gcc/PKGBUILD
+++ b/cross/cross-gcc/PKGBUILD
@@ -103,10 +103,10 @@ case ${_target%%-*} in
 esac
 
 pkgname=$_target-gcc
-_pkgver=9.2.0
+_pkgver=9.3.0
 #_snapshot=9-20190601
 pkgver=$_pkgver${_snapshot/*-/+}
-_islver=0.21
+_islver=0.22
 pkgrel=1
 pkgdesc="The GNU Compiler Collection - cross compiler for $_target_name target"
 arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el' 'ppc64le')
@@ -114,13 +114,14 @@ url='http://gcc.gnu.org/'
 license=(GPL LGPL FDL)
 depends=($_target-binutils libmpc zlib)
 makedepends=(gmp mpfr)
-#optdepends=("$_target-newlib: Standard C library ($_target target)") # Uncomment if building --with-newlib support
+# Uncomment the following if building --with-newlib support
+#optdepends=("$_target-newlib: Standard C library ($_target target)")
 options=(!emptydirs !strip)
 source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$_pkgver/gcc-$_pkgver.tar.xz
         #https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
         http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
-sha512sums=('a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040'
-            '48f3b8d90550e8ab28837b5757f87bf99cddec67769877e04942abef69bbe526ef4c863951d55dd89a6027dc09df48988c8df6029782f990aa4d5b67e65f6d53')
+sha512sums=('4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de'
+            'fc2c9796979610dd51143dcefe4f5c989c4354571cc5a1fcc6b932fd41f42a54f6b43adfd289af61be7bd06f3a523fa6a7d7ee56680e32d8036beb4c188fa668')
 
 if [ -n "$_snapshot" ]; then
   _basedir=gcc-$_snapshot
@@ -142,11 +143,11 @@ prepare() {
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
 
-  mkdir $srcdir/build-gcc
+  mkdir $srcdir/gcc-build
 }
 
 build() {
-  cd build-gcc
+  cd gcc-build
 
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
@@ -181,27 +182,25 @@ build() {
     --with-libelf \
     --enable-gnu-indirect-function
 
-  make $MAKEFLAGS all-gcc
+  make all-gcc
 }
 
 package() {
-  cd build-gcc
-
-  make DESTDIR="$pkgdir" install-gcc
-  # Use the following instead if building using `make' without options in build()
-  #make DESTDIR="$pkgdir" install
+  # Uncomment the last part if libgcc was also built
+  cd gcc-build -C make DESTDIR="$pkgdir" install-gcc # install-target-{libgcc,libstdc++-v3}
 
   # strip target binaries
-  find "$pkgdir"/usr/lib/gcc/$_target/ -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 '{}' \;
-  # Use the following instead if building using `make' without options in build()
-  #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 '{}' \;
+  # add "$pkgdir"/usr/$_target/lib next to "$pkgdir"/usr/lib/gcc/$_target/ if libgcc was built
+  find "$pkgdir"/usr/lib/gcc/$_target/ \
+       -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/ -type f -and \( -executable \) -exec strip '{}' \;
+  find "$pkgdir/usr/bin/" "$pkgdir/usr/lib/gcc/$_target/" -type f \
+    -and \( -executable \) -exec strip '{}' \;
 
   # Remove files that conflict with host gcc package
-  rm -r "$pkgdir"/usr/share/man/man7
-  rm -r "$pkgdir"/usr/share/info
-  # Add the following if building using `make' without options in build()
-  #rm "$pkgdir"/usr/lib/libcc1.*
+  rm -r "$pkgdir/usr/share/"{man/man7,info}
 }
-- 
cgit v1.2.3