pcr/riscv64-*: updated

4 files changed, 72 insertions, 65 deletions

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
 }
diff --git a/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD b/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
index 9a48ab126..e8456694d 100644
--- a/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-gcc-bootstrap/PKGBUILD
@@ -9,40 +9,44 @@
 
 _target=riscv64-linux-gnu
 pkgname=$_target-gcc-bootstrap
-_snapshot=20171231
-pkgver=7.2.0.v$_snapshot
+pkgver=7.3.0
+_islver=0.18
 pkgrel=1
+_snapshot=7-20180125
 pkgdesc='The GNU Compiler Collection - cross compiler for riscv64 target - bootstrap version. only used to build initial glibc and compiler'
 arch=(x86_64)
-url='https://github.com/riscv/riscv-gnu-toolchain'
+url='http://gcc.gnu.org/'
 license=(GPL LGPL FDL)
 depends=($_target-binutils libmpc zlib)
-makedepends=(git)
+makedepends=(gmp mpfr)
 options=(!emptydirs !strip)
 provides=(${pkgname%-bootstrap})
 conflicts=(${pkgname%-bootstrap})
-source=("$_target::git+https://github.com/riscv/riscv-gnu-toolchain#tag=v$_snapshot")
-sha256sums=('SKIP')
+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'
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
+
+if [ -n "$_snapshot" ]; then
+  _basedir=gcc-$_snapshot
+else
+  _basedir=gcc-$pkgver
+fi
 
 prepare() {
-  cd "$srcdir/$_target"
+  cd $_basedir
 
-  # fix submodule repo paths
-  sed -i 's#\.\.#git://github.com/riscv#' .gitmodules
-  # update submodule
-  git submodule update --init riscv-gcc
-
-  cd "$srcdir/$_target/riscv-gcc"
+  # link isl for in-tree builds
+  ln -sf ../isl-$_islver isl
 
   echo $pkgver > gcc/BASE-VER
 
-  ./contrib/download_prerequisites
-
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_target/riscv-gcc/{libiberty,gcc}/configure
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
 
   rm -rf $srcdir/gcc-build
   mkdir $srcdir/gcc-build
@@ -56,7 +60,7 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  $srcdir/$_target/riscv-gcc/configure \
+  $srcdir/$_basedir/configure \
       --prefix=/usr \
       --program-prefix=$_target- \
       --with-local-prefix=/usr/$_target \
@@ -78,8 +82,8 @@ build() {
 		  --disable-libgomp \
 		  --disable-nls \
 		  --disable-bootstrap \
-      --enable-chehcking=release \
-      --disable-multilib \
+      --enable-checking=release \
+      --disable-multilib
 
 	make inhibit-libc=true all-gcc
 	make inhibit-libc=true all-target-libgcc
diff --git a/pcr/riscv64-linux-gnu-gcc/PKGBUILD b/pcr/riscv64-linux-gnu-gcc/PKGBUILD
index b94b26e43..b90fc466d 100644
--- a/pcr/riscv64-linux-gnu-gcc/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-gcc/PKGBUILD
@@ -6,40 +6,44 @@
 
 _target=riscv64-linux-gnu
 pkgname=$_target-gcc
-_snapshot=20171231
-pkgver=7.2.0.v$_snapshot
+pkgver=7.3.0
+_islver=0.18
 pkgrel=1
+_snapshot=7-20180125
 pkgdesc='The GNU Compiler Collection - cross compiler for riscv64 target'
 arch=(x86_64)
-url='https://github.com/riscv/riscv-gnu-toolchain'
+url='http://gcc.gnu.org/'
 license=(GPL LGPL FDL)
 depends=($_target-binutils $_target-glibc libmpc zlib)
-makedepends=(git)
-options=(!emptydirs !strip)
+makedepends=(gmp mpfr)
+options=(!emptydirs !strip staticlibs)
 conflicts=($pkgname-bootstrap)
 replaces=($pkgname-bootstrap)
-source=("$_target::git+https://github.com/riscv/riscv-gnu-toolchain#tag=v$_snapshot")
-sha256sums=('SKIP')
+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'
+            '6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b')
+
+if [ -n "$_snapshot" ]; then
+  _basedir=gcc-$_snapshot
+else
+  _basedir=gcc-$pkgver
+fi
 
 prepare() {
-  cd "$srcdir/$_target"
+  cd $_basedir
 
-  # fix submodule repo paths
-  sed -i 's#\.\.#git://github.com/riscv#' .gitmodules
-  # update submodule
-  git submodule update --init riscv-gcc
-
-  cd "$srcdir/$_target/riscv-gcc"
+  # link isl for in-tree builds
+  ln -sf ../isl-$_islver isl
 
   echo $pkgver > gcc/BASE-VER
 
-  ./contrib/download_prerequisites
-
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_target/riscv-gcc/{libiberty,gcc}/configure
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
 
   rm -rf $srcdir/gcc-build
   mkdir $srcdir/gcc-build
@@ -53,7 +57,7 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  $srcdir/$_target/riscv-gcc/configure \
+  $srcdir/$_basedir/configure \
       --prefix=/usr \
       --program-prefix=$_target- \
       --with-local-prefix=/usr/$_target \
@@ -70,7 +74,7 @@ build() {
 		  --disable-libquadmath \
 		  --disable-nls \
 		  --disable-bootstrap \
-      --enable-chehcking=release \
+      --enable-checking=release \
       --disable-multilib
 
   make
@@ -79,7 +83,7 @@ build() {
 package() {
   cd gcc-build
 
-  make DESTDIR="$pkgdir" install-gcc install-target-libgcc install-target-libstdc++-v3
+  make DESTDIR="$pkgdir" install
 
   # strip target binaries
   find "$pkgdir"/usr/lib/gcc/$_target/ "$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 '{}' \;
@@ -88,6 +92,7 @@ package() {
   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/lib/libcc1.so{,.0,.0.0.0}
   rm -r "$pkgdir"/usr/share/man/man7
   rm -r "$pkgdir"/usr/share/info
   rm -r "$pkgdir"/usr/share/gcc-$pkgver
diff --git a/pcr/riscv64-linux-gnu-glibc/PKGBUILD b/pcr/riscv64-linux-gnu-glibc/PKGBUILD
index 124836d15..95b36be1c 100644
--- a/pcr/riscv64-linux-gnu-glibc/PKGBUILD
+++ b/pcr/riscv64-linux-gnu-glibc/PKGBUILD
@@ -10,7 +10,7 @@ _snapshot=20171231
 pkgver=2.26.v$_snapshot
 pkgrel=1
 pkgdesc="GNU C Library riscv64 target"
-arch=(any)
+arch=('x86_64')
 url='https://github.com/riscv/riscv-gnu-toolchain'
 license=('GPL' 'LGPL')
 depends=($_target-gcc $_target-linux-api-headers)
@@ -59,7 +59,6 @@ build() {
       --disable-multilib \
       --enable-kernel=3.0.0
 
-  echo "build-programs=no" >> configparms
   make
 }
 
@@ -67,6 +66,4 @@ package() {
   cd glibc-build
 
   make install_root=$pkgdir/usr/$_target install
-
-  rm -rf $pkgdir/usr/$_target/{bin,sbin,etc,share,var}
 }