Update to version 8.1.1+20180531

3 files changed, 36 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ae6e4adb2904..284e134d20fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = gdc
-	pkgver = 8.1.0
+	pkgver = 8.1.1+20180531
 	pkgrel = 1
 	url = https://github.com/D-Programming-GDC/GDC
 	arch = i686
@@ -7,33 +7,30 @@ pkgbase = gdc
 	license = GPL
 	makedepends = binutils>=2.26
 	makedepends = git
-	source = https://ftp.gnu.org/gnu/gcc/gcc-8.1.0/gcc-8.1.0.tar.xz
-	source = http://isl.gforge.inria.fr/isl-0.18.tar.bz2
+	source = https://sources.archlinux.org/other/gcc/gcc-8.1.1-20180531.tar.xz
+	source = http://isl.gforge.inria.fr/isl-0.19.tar.bz2
 	source = gdc::git+https://github.com/D-Programming-GDC/GDC.git
 	source = git+https://github.com/D-Programming-GDC/GDMD.git
 	source = paths.diff
-	sha256sums = 1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153
-	sha256sums = 6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b
+	sha256sums = a92eb923a4368548666acfc619074c76c4f6cdc34c9348f7e7aa56656aaee0d5
+	sha256sums = d59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = fefe9298f8d5859758ca63bab084984baa8adbbd85b3b3b8798283731321df7b
+	sha256sums = bb4219be52f61de48fc02f522220f013f12859a03c678417b03a1c8ee783d9dd
 
 pkgname = gdc
 	pkgdesc = Compiler for D programming language which uses gcc backend
 	depends = gcc
 	depends = perl
 	depends = binutils
-	depends = libgphobos-devel
+	depends = libgphobos
 	provides = d-compiler=2.076.1
 
-pkgname = libgphobos-devel
+pkgname = libgphobos
 	pkgdesc = Standard library for D programming language, GDC port
 	provides = d-runtime
 	provides = d-stdlib
+	conflicts = libgphobos-devel
+	replaces = libgphobos-devel
 	options = staticlibs
 
-pkgname = libgphobos
-	pkgdesc = Shared standard library for D programming language, GDC port
-	provides = d-runtime
-	provides = d-stdlib
-
diff --git a/PKGBUILD b/PKGBUILD
index b456046e99ba..d5d81bac027d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,28 +7,29 @@
 # Contributor: Elijah Stone <elronnd@elronnd.net>
 # Contributor: Daniel Kozak <kozzi11@gmail.com>
 
-pkgname=('gdc' 'libgphobos-devel' 'libgphobos')
-pkgver=8.1.0
+pkgname=('gdc' 'libgphobos')
+pkgver=8.1.1+20180531
+_majorver=${pkgver:0:1}
 pkgrel=1
-_islver=0.18
+_islver=0.19
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://github.com/D-Programming-GDC/GDC"
 makedepends=('binutils>=2.26' 'git')
 
 source=(
-	https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
+	https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz
 	http://isl.gforge.inria.fr/isl-$_islver.tar.bz2
 	gdc::git+https://github.com/D-Programming-GDC/GDC.git
 	git+https://github.com/D-Programming-GDC/GDMD.git
 	paths.diff
 )
 sha256sums=(
-	'1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153'
-	'6b8b0fd7f81d0a957beb3679c81bbb34ccc7568d5682844d8924424a0dadcb1b'
+	'a92eb923a4368548666acfc619074c76c4f6cdc34c9348f7e7aa56656aaee0d5'
+	'd59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8'
 	'SKIP'
 	'SKIP'
-	'fefe9298f8d5859758ca63bab084984baa8adbbd85b3b3b8798283731321df7b'
+	'bb4219be52f61de48fc02f522220f013f12859a03c678417b03a1c8ee783d9dd'
 )
 
 _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
@@ -51,7 +52,7 @@ prepare() {
 
 	# GDC setup
 	cd $srcdir/gdc
-	git checkout gdc-8
+	git checkout gdc-8-stable
 	git apply $srcdir/paths.diff
 	./setup-gcc.sh ../gcc
 
@@ -102,8 +103,8 @@ build() {
 }
 
 package_gdc() {
-	depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
-	provides=("d-compiler=2.076.1")
+	depends=('gcc' 'perl' 'binutils' 'libgphobos')
+	provides=('d-compiler=2.076.1')
 	pkgdesc="Compiler for D programming language which uses gcc backend"
 
 	# compiler
@@ -116,23 +117,13 @@ package_gdc() {
 }
 
 
-package_libgphobos-devel() {
+package_libgphobos() {
 	pkgdesc="Standard library for D programming language, GDC port"
-	provides=("d-runtime" "d-stdlib")
-	options=("staticlibs")
+	provides=('d-runtime' 'd-stdlib')
+	options=('staticlibs')
+    conflicts=('libgphobos-devel')
+    replaces=('libgphobos-devel')
 
 	cd $srcdir/gcc-build
 	make -C $CHOST/libphobos DESTDIR=$pkgdir install
-
-	# remove shared library bits, they go into own package
-	rm $pkgdir/usr/lib/lib*so*
-}
-
-package_libgphobos() {
-	pkgdesc="Shared standard library for D programming language, GDC port"
-	provides=("d-runtime" "d-stdlib")
-
-	cd $srcdir/gcc-build
-	install -D -m644 $CHOST/libphobos/src/.libs/libgphobos.so $pkgdir/usr/lib/libgphobos.so
-	install -D -m644 $CHOST/libphobos/libdruntime/.libs/libgdruntime.so $pkgdir/usr/lib/libgdruntime.so
-}
+}
\ No newline at end of file
diff --git a/paths.diff b/paths.diff
index 37bfbd5ed18f..e367bbe0a814 100644
--- a/paths.diff
+++ b/paths.diff
@@ -1,8 +1,8 @@
 diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
-index e71cb64f..c57d0749 100644
+index e6cc314c..2618f571 100644
 --- a/gcc/d/d-incpath.cc
 +++ b/gcc/d/d-incpath.cc
-@@ -175,7 +175,7 @@ add_import_paths (const char *iprefix, const char *imultilib, bool stdinc)
+@@ -140,7 +140,7 @@ add_import_paths (const char *iprefix, const char *imultilib, bool stdinc)
  	    path = xstrdup (p->fname);
  
  	  /* Add D-specific suffix.  */
@@ -12,28 +12,28 @@ index e71cb64f..c57d0749 100644
  	  /* Ignore duplicate entries.  */
  	  bool found = false;
 diff --git a/libphobos/configure b/libphobos/configure
-index a3f0d5ca..1a7a9bf8 100755
+index 3fdd8dfd..ac6d77a5 100755
 --- a/libphobos/configure
 +++ b/libphobos/configure
-@@ -14671,7 +14671,7 @@ fi
+@@ -14547,7 +14547,7 @@ fi
  
  
    # Default case for install directory for D sources files.
--  gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
+-  gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
 +  gdc_include_dir='/usr/include/dlang/gdc/'
  
  
  
 diff --git a/libphobos/m4/druntime.m4 b/libphobos/m4/druntime.m4
-index fac44aac..4d95b74d 100644
+index 93f01efc..6049eaf9 100644
 --- a/libphobos/m4/druntime.m4
 +++ b/libphobos/m4/druntime.m4
-@@ -78,7 +78,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
+@@ -97,7 +97,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
    AC_SUBST(toolexeclibdir)
  
    # 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='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
++  gdc_include_dir='/usr/include/dlang/gdc/'
    AC_SUBST(gdc_include_dir)
  ])