From aa5a1b49d9f7eda4b864d12e90c2cf49fda43f35 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Tue, 20 Feb 2018 13:26:41 +0100
Subject: pcr/riscv64-*: updated

---
 pcr/riscv64-linux-gnu-binutils/PKGBUILD | 45 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'pcr/riscv64-linux-gnu-binutils/PKGBUILD')

diff --git a/pcr/riscv64-linux-gnu-binutils/PKGBUILD b/pcr/riscv64-linux-gnu-binutils/PKGBUILD
index abc12c0f8..4b80a4bfe 100644
--- a/pcr/riscv64-linux-gnu-binutils/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-binutils/PKGBUILD
@@ -7,32 +7,32 @@
 
 _target=riscv64-linux-gnu
 pkgname=$_target-binutils
-_snapshot=20171231
-pkgver=2.29.v$_snapshot
+pkgver=2.30
 pkgrel=1
 pkgdesc='A set of programs to assemble and manipulate binary and object files for the riscv64 target'
 arch=(x86_64)
-url='https://github.com/riscv/riscv-gnu-toolchain'
+url='http://www.gnu.org/software/binutils/'
 license=(GPL)
 depends=(zlib)
-makedepends=(git)
-source=("$_target::git+https://github.com/riscv/riscv-gnu-toolchain#tag=v$_snapshot")
-sha256sums=('SKIP')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig})
+sha1sums=('33d807f7fa680b00439eb5560acd0c2ef645e5f9'
+          'SKIP')
+validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93'  # Tristan Gingold <gingold@adacore.com>
+              '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
 
 prepare() {
-  cd "$srcdir/$_target"
-
-  # fix submodule repo paths
-  sed -i 's#\.\.#git://github.com/riscv#' .gitmodules
-  # update submodule
-  git submodule update --init riscv-binutils-gdb
-
-  cd "$srcdir/$_target/riscv-binutils-gdb"
+  cd binutils-$pkgver
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 }
 
 build() {
-  cd "$srcdir/$_target/riscv-binutils-gdb"
+  cd binutils-$pkgver
+
+  if [ "${CARCH}" != "i686" ];
+  then
+    # enabling gold linker at i686 makes the install fail
+    enable_gold='--enable-gold'
+  fi
 
   ./configure --target=$_target \
               --with-sysroot=/usr/$_target \
@@ -42,28 +42,29 @@ build() {
               --with-gnu-ld \
               --disable-nls \
               --enable-ld=default \
-              --enable-gold \
+              $enable_gold \
               --enable-plugins \
-              --enable-deterministic-archives \
-              --disable-gdb
+              --enable-deterministic-archives
 
   make
 }
 
 check() {
-  cd "$srcdir/$_target/riscv-binutils-gdb"
-
+  cd binutils-$pkgver
+  
   # unset LDFLAGS as testsuite makes assumptions about which ones are active
   # do not abort on errors - manually check log files
   make -k LDFLAGS="" check || true
 }
 
 package() {
-  cd "$srcdir/$_target/riscv-binutils-gdb"
+  cd binutils-$pkgver
 
   make DESTDIR="$pkgdir" install
 
   # Remove file conflicting with host binutils and manpages for MS Windows tools
-  rm -r "$pkgdir"/usr/share/info
   rm "$pkgdir"/usr/share/man/man1/$_target-{dlltool,nlmconv,windres,windmc}*
+
+  # Remove info documents that conflict with host version
+  rm -r "$pkgdir"/usr/share/info
 }
-- 
cgit v1.2.3