From 0c50ec0013be5a7201c8eaf03e374818b83674d6 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 5 May 2019 20:20:57 -0700
Subject: Clean up PKGBUILD

---
 PKGBUILD | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index dede6d1..ea20624 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,7 @@
 
 _target=sh-elf
 pkgname=$_target-gcc
-_pkgver=8.3.0
-#_snapshot=8-20180824
-pkgver=$_pkgver${_snapshot/*-/+}
+pkgver=8.3.0
 _islver=0.21
 pkgrel=1
 pkgdesc='The GNU Compiler Collection - cross compiler for SuperH target'
@@ -20,8 +18,7 @@ depends=($_target-binutils libmpc zlib)
 makedepends=(gmp mpfr $_target-newlib)
 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{,.sig}
-        #https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
+source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}
         http://isl.gforge.inria.fr/isl-$_islver.tar.xz)
 sha512sums=('1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802'
             'SKIP'
@@ -31,7 +28,7 @@ validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek <jakub@r
 if [ -n "$_snapshot" ]; then
   _basedir=gcc-$_snapshot
 else
-  _basedir=gcc-$_pkgver
+  _basedir=gcc-$pkgver
 fi
 
 prepare() {
@@ -40,7 +37,7 @@ prepare() {
   # link isl for in-tree builds
   ln -sf ../isl-$_islver isl
 
-  echo $_pkgver > gcc/BASE-VER
+  echo $pkgver > gcc/BASE-VER
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
@@ -95,10 +92,10 @@ package() {
   make DESTDIR="$pkgdir" install
 
   # 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 '{}' \;
+  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 '{}' \;
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/$pkgver -type f -and \( -executable \) -exec strip '{}' \;
 
   # Remove files that conflict with host gcc package
   rm -r "$pkgdir"/usr/share/man/man7
-- 
cgit v1.2.1