pcr/riscv64-*: updated

1 files changed, 25 insertions, 20 deletions

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