Updated to v7.1.0

2 files changed, 22 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 87fde9928ad5..94db2bb3342c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,36 @@
 # Contributor: Jerome Berger <jeberger@free.fr>
 # Contributor: Jesus Alvarez <jeezusjr@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Elijah Stone <elronnd@protonmail.ch>
 
 pkgname=('gdc' 'libgphobos-devel' 'libgphobos')
-pkgver=6.2.1
+pkgver=7.1.0
 pkgrel=2
 _islver=0.16.1
-_gcc_commit=c2103c1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://github.com/D-Programming-GDC/GDC"
 makedepends=('binutils>=2.26' 'git')
 
 source=(
-    git+https://gcc.gnu.org/git/gcc.git#commit=$_gcc_commit
+    https://ftp.gnu.org/pub/gnu/gcc/gcc-7.1.0/gcc-7.1.0.tar.bz2
     http://isl.gforge.inria.fr/isl-$_islver.tar.bz2
-    gdc::git+https://github.com/D-Programming-GDC/GDC.git#tag=v2.068.2_gcc6
+    gdc::git+https://github.com/D-Programming-GDC/GDC.git
     git+https://github.com/D-Programming-GDC/GDMD.git
     paths.diff
 )
 sha256sums=(
-    'SKIP'
+    '8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17'
     '412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2'
     'SKIP'
     'SKIP'
-    'e04cea391007ebab5d9b0ff33179c1fded0afcf43059b811290472ea52222361'
+    'fefe9298f8d5859758ca63bab084984baa8adbbd85b3b3b8798283731321df7b'
 )
 
 _libdir="usr/lib/gcc/$CHOST/$pkgver"
 
 prepare() {
-    cd $srcdir/gcc
+    cd $srcdir/gcc-$pkgver
 
     # link isl for in-tree build
     ln -s ../isl-$_islver isl
@@ -49,8 +49,9 @@ prepare() {
 
     # GDC setup
     cd $srcdir/gdc
+    git checkout gdc-7
     git apply $srcdir/paths.diff
-    ./setup-gcc.sh ../gcc
+    ./setup-gcc.sh ../gcc-$pkgver
 
     mkdir $srcdir/gcc-build
 }
@@ -63,7 +64,7 @@ build() {
     CFLAGS=${CFLAGS/-pipe/}
     CXXFLAGS=${CXXFLAGS/-pipe/}
 
-    $srcdir/gcc/configure --prefix=/usr \
+    $srcdir/gcc-$pkgver/configure --prefix=/usr \
         --libdir=/usr/lib \
         --libexecdir=/usr/lib \
         --mandir=/usr/share/man \
@@ -90,6 +91,7 @@ build() {
         --enable-default-pie \
         --disable-multilib \
         --disable-werror \
+        --enable-gold \
         --enable-languages=d \
         gdc_include_dir=/usr/include/dlang/gdc
 
diff --git a/paths.diff b/paths.diff
index 58a23306e602..37bfbd5ed18f 100644
--- a/paths.diff
+++ b/paths.diff
@@ -1,21 +1,21 @@
 diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
-index 995ff792..3e06bc0a 100644
+index e71cb64f..c57d0749 100644
 --- a/gcc/d/d-incpath.cc
 +++ b/gcc/d/d-incpath.cc
-@@ -206,7 +206,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
- 	    import_path = xstrdup(p->fname);
+@@ -175,7 +175,7 @@ add_import_paths (const char *iprefix, const char *imultilib, bool stdinc)
+ 	    path = xstrdup (p->fname);
  
- 	  // Add D-specific suffix.
--	  import_path = concat(import_path, "/d", NULL);
-+	  import_path = concat(import_path, "/dlang/gdc", NULL);
+ 	  /* Add D-specific suffix.  */
+-	  path = concat (path, "/d", NULL);
++	  path = concat (path, "/dlang/gdc", NULL);
  
- 	  // Ignore duplicate entries.
+ 	  /* Ignore duplicate entries.  */
  	  bool found = false;
 diff --git a/libphobos/configure b/libphobos/configure
-index 7325fcbf..a75286c8 100755
+index a3f0d5ca..1a7a9bf8 100755
 --- a/libphobos/configure
 +++ b/libphobos/configure
-@@ -14658,7 +14658,7 @@ fi
+@@ -14671,7 +14671,7 @@ fi
  
  
    # Default case for install directory for D sources files.
@@ -25,7 +25,7 @@ index 7325fcbf..a75286c8 100755
  
  
 diff --git a/libphobos/m4/druntime.m4 b/libphobos/m4/druntime.m4
-index fac44aac..6ff6b2c7 100644
+index fac44aac..4d95b74d 100644
 --- a/libphobos/m4/druntime.m4
 +++ b/libphobos/m4/druntime.m4
 @@ -78,7 +78,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
@@ -33,7 +33,7 @@ index fac44aac..6ff6b2c7 100644
  
    # Default case for install directory for D sources files.
 -  gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+  gdc_include_dir='/usr/include/dlang/gdc/'
++  gdc_include_dir='/usr/include/dlang/gdc'
    AC_SUBST(gdc_include_dir)
  ])