From 45d4b89c80c03289d2f7709a45afd6338dd07675 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Wed, 21 Feb 2018 10:33:50 +0100
Subject: pcr/riscv64-*: updated gcc to newer snapshot, updated glibc to
 upstream

---
 pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD |  8 +++----
 pcr/riscv64-linux-gnu-gcc/PKGBUILD           |  6 ++---
 pcr/riscv64-linux-gnu-glibc/PKGBUILD         | 35 ++++++++++++++--------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD b/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
index e8456694d..ed88ed36b 100644
--- a/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
@@ -9,10 +9,10 @@
 
 _target=riscv64-linux-gnu
 pkgname=$_target-gcc-bootstrap
-pkgver=7.3.0
+pkgver=7.3.1
 _islver=0.18
-pkgrel=1
-_snapshot=7-20180125
+pkgrel=2
+_snapshot=7-20180215
 pkgdesc='The GNU Compiler Collection - cross compiler for riscv64 target - bootstrap version. only used to build initial glibc and compiler'
 arch=(x86_64)
 url='http://gcc.gnu.org/'
@@ -25,7 +25,7 @@ conflicts=(${pkgname%-bootstrap})
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
         ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
         http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
-sha256sums=('f4cad0895aa6dd237cbcb6e81750e40c3fb3eba8a5bcdf25a21c4ee5520c344b'
+sha256sums=('bb276f6fce4822fc0806d1e87d21245854d1e41f2a7027c7288375084176c679'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
 
 if [ -n "$_snapshot" ]; then
diff --git a/pcr/riscv64-linux-gnu-gcc/PKGBUILD b/pcr/riscv64-linux-gnu-gcc/PKGBUILD
index b90fc466d..ff9635466 100644
--- a/pcr/riscv64-linux-gnu-gcc/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-gcc/PKGBUILD
@@ -8,8 +8,8 @@ _target=riscv64-linux-gnu
 pkgname=$_target-gcc
 pkgver=7.3.0
 _islver=0.18
-pkgrel=1
-_snapshot=7-20180125
+pkgrel=2
+_snapshot=7-20180215
 pkgdesc='The GNU Compiler Collection - cross compiler for riscv64 target'
 arch=(x86_64)
 url='http://gcc.gnu.org/'
@@ -22,7 +22,7 @@ replaces=($pkgname-bootstrap)
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
         ftp://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
         http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
-sha256sums=('f4cad0895aa6dd237cbcb6e81750e40c3fb3eba8a5bcdf25a21c4ee5520c344b'
+sha256sums=('bb276f6fce4822fc0806d1e87d21245854d1e41f2a7027c7288375084176c679'
             '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
 
 if [ -n "$_snapshot" ]; then
diff --git a/pcr/riscv64-linux-gnu-glibc/PKGBUILD b/pcr/riscv64-linux-gnu-glibc/PKGBUILD
index 95b36be1c..5e412d21f 100644
--- a/pcr/riscv64-linux-gnu-glibc/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-glibc/PKGBUILD
@@ -6,28 +6,22 @@
 
 _target=riscv64-linux-gnu
 pkgname=$_target-glibc
-_snapshot=20171231
-pkgver=2.26.v$_snapshot
+pkgver=2.27
 pkgrel=1
+_commit=be176490b818b65b5162c332eb6b581690b16e5c
 pkgdesc="GNU C Library riscv64 target"
 arch=('x86_64')
-url='https://github.com/riscv/riscv-gnu-toolchain'
+url='http://www.gnu.org/software/libc/'
 license=('GPL' 'LGPL')
 depends=($_target-gcc $_target-linux-api-headers)
-makedepends=(git)
 options=(!buildflags !strip staticlibs)
-source=("$_target::git+https://github.com/riscv/riscv-gnu-toolchain#tag=v$_snapshot")
-sha256sums=('SKIP')
+source=(http://ftp.gnu.org/gnu/libc/glibc-$pkgver.tar.xz{,.sig})
+sha1sums=('1f7a9c43026484943ef7cf6885f2176a2bc1e093'
+          'SKIP')
+validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8)  # "Carlos O'Donell <carlos@systemhalted.org>"
 
 prepare() {
   mkdir -p glibc-build
-
-  cd "$srcdir/$_target"
-
-  # fix submodule repo paths
-  sed -i 's#\.\.#git://github.com/riscv#' .gitmodules
-  # update submodule
-  git submodule update --init riscv-glibc
 }
 
 build() {
@@ -46,18 +40,23 @@ build() {
   export AR=${_target}-ar
   export RANLIB=${_target}-ranlib
 
-  ../$_target/riscv-glibc/configure \
+  ../glibc-$pkgver/configure \
       --prefix=/usr \
       --target=$_target \
       --host=$_target \
+      --build=$CHOST \
       --libdir=/usr/lib \
       --libexecdir=/usr/lib \
-      --disable-werror \
-      --enable-shared \
-      --enable-obsolete-rpc \
       --with-headers=/usr/$_target/include \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-add-ons \
+      --enable-obsolete-rpc \
+      --enable-kernel=3.0.0 \
+      --enable-bind-now \
+      --disable-profile \
+      --enable-shared \
       --disable-multilib \
-      --enable-kernel=3.0.0
+      --disable-werror
 
   make
 }
-- 
cgit v1.2.3