[arch-commits] Commit in gdc/trunk (PKGBUILD)

[Filipe Laíns]

    Date: Wednesday, August 29, 2018 @ 23:15:54
  Author: ffy00
Revision: 375395

fix pkgbuild

Modified:
  gdc/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-29 22:37:06 UTC (rev 375394)
+++ PKGBUILD	2018-08-29 23:15:54 UTC (rev 375395)
@@ -10,9 +10,9 @@
 pkgbase=gdc
 pkgname=('gdc' 'libgphobos')
 pkgver=8.2.0+2.068.2
-_branch=gdc-8-stable # Change here! pkgver/_gccver/_d_ver will be automatically updated.
-_islver=0.19 # Change here!
-_gccver=$(curl https://raw.githubusercontent.com/D-Programming-GDC/GDC/$_branch/gcc.version)
+_branch=gdc-8-stable
+_islver=0.19
+_gccver=8.2.0-RC-20180719
 _d_ver=''
 pkgrel=2
 arch=('x86_64')
@@ -21,12 +21,12 @@
 pkgdesc="GCC based D compiler"
 groups=('dlang')
 makedepends=('git')
-source=("ftp://gcc.gnu.org/pub/gcc/snapshots/${_gccver#gcc-}/$_gccver.tar.xz"
+source=("ftp://gcc.gnu.org/pub/gcc/snapshots/$_gccver/gcc-$_gccver.tar.xz"
         "http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
-        'gdc::git+https://github.com/D-Programming-GDC/GDC.git'
+        "gdc::git+https://github.com/D-Programming-GDC/GDC.git#branch=$_branch"
         'git+https://github.com/D-Programming-GDC/GDMD.git'
         'paths.diff')
-sha512sums=('64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed'
+sha512sums=('cabd998089c219d92e89308e5904c59acebf31c57f83da1d3febce57597ca42897e252823c7f6242f0f3b45c91df3b39163898a596f935d9561a58f8acb148bd'
             '08f4db964d9e02ec8aa9779378ed76e0ddf1d56f81f87664dbf787555ce496cdc87e836f8a51ae137f45e648c604870cce07ee45919eafb549e404afb8f27083'
             'SKIP'
             'SKIP'
@@ -38,7 +38,7 @@
 
 prepare() {
   # Setup paths
-  ln -sf "$srcdir"/$_gccver "$srcdir"/gcc
+  ln -sf "$srcdir"/gcc-$_gccver "$srcdir"/gcc
   ln -sf "$srcdir"/isl-$_islver "$srcdir"/gcc/isl
 
   # Setup gcc
@@ -50,22 +50,21 @@
   # Seup gdc
   cd "$srcdir"/gdc
 
-  git checkout $_branch
   git apply "$srcdir"/paths.diff
   ./setup-gcc.sh ../gcc
 
   mkdir "$srcdir"/gcc-build
+}
 
+build() {
+  cd "$srcdir"/gcc-build
+
   if [ -f gcc/d/verstr.h ]; then
     _d_ver="+$(cat gcc/d/verstr.h | sed 's|\"||g')"
   elif [ -f gcc/d/VERSION ]; then
     _d_ver="+$(cat gcc/d/VERSION | sed 's|\"||g')"
   fi
-}
 
-build() {
-  cd "$srcdir"/gcc-build
-
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   export CFLAGS="${CFLAGS/-pipe/} -O2"
@@ -114,11 +113,9 @@
   provides=("d-compiler=${pkgver#*+}")
   pkgdesc="Compiler for D programming language which uses gcc backend"
 
-  _libdir=usr/lib/gcc/$CHOST/${pkgver%+*}
-
   # Binaries
   install -Dm 755 gcc-build/gcc/gdc "$pkgdir"/usr/bin/gdc
-  install -Dm 755 gcc-build/gcc/cc1d "$pkgdir"/$_libdir/cc1d
+  install -Dm 755 gcc-build/gcc/cc1d "$pkgdir"/usr/lib/gcc/$CHOST/${pkgver%+*}/cc1d
   install -Dm 755 GDMD/dmd-script "$pkgdir"/usr/bin/gdmd
 
   # Doc
@@ -135,7 +132,6 @@
   make -C $CHOST/libphobos DESTDIR="$pkgdir" install
 
   if [ -d "$pkgdir"/usr/lib64 ]; then
-    echo "/usr/lib64 detected - !!!"
     mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib
     rmdir "$pkgdir"/usr/lib64
   fi