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

[Filipe Laíns]

    Date: Thursday, August 30, 2018 @ 13:39:07
  Author: ffy00
Revision: 375464

upgpkg: gdc 8.2.0+2.068.2-3

Modified:
  gdc/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-30 08:07:06 UTC (rev 375463)
+++ PKGBUILD	2018-08-30 13:39:07 UTC (rev 375464)
@@ -9,11 +9,12 @@
 
 pkgbase=gdc
 pkgname=('gdc' 'libgphobos')
-pkgver=8.2.0
+pkgver=8.2.0+2.068.2
 _branch=gdc-8-stable
 _islver=0.19
 _gccver=8.2.0-RC-20180719
-pkgrel=1
+_d_ver=''
+pkgrel=3
 arch=('x86_64')
 license=('GPL3')
 url="https://github.com/D-Programming-GDC/GDC"
@@ -32,11 +33,10 @@
             '841504e9dffe718f7e5a5fbbf03299f2b51acd783d47f99894aa5d411abcc56aedfffd4b16595e3a9446f2206f9eb29cb01e235e82c211796cd24dc23c02b578')
 
 pkgver() {
-  _d_ver_=''
-  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')"
+  if [ -f gdc/gcc/d/verstr.h ]; then
+    _d_ver="+$(cat gdc/gcc/d/verstr.h | sed 's|\"||g')"
+  elif [ -f gdc/gcc/d/VERSION ]; then
+    _d_ver="+$(cat gdc/gcc/d/VERSION | sed 's|\"||g')"
   fi
 
   echo "$(cat gdc/gcc.version | sed -e 's|gcc-||' -e 's|-.*||')$_d_ver"
@@ -102,7 +102,7 @@
                           --with-pkgversion="GDC ${pkgver%+*} based on D v${pkgver#*+} built with ISL $_isl for Arch Linux" \
                           gdc_include_dir=/usr/include/dlang/gdc
 
-                          #--enable-gold \
+                          #--enable-gold \ 
 
 
   make
@@ -130,4 +130,9 @@
 
   cd "$srcdir"/gcc-build
   make -C $CHOST/libphobos DESTDIR="$pkgdir" install
+
+  if [ -d "$pkgdir"/usr/lib64 ]; then
+    mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib
+    rmdir "$pkgdir"/usr/lib64
+  fi
 }