Bump to current commit on git as this builds.

2 files changed, 35 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2892cc38b63a..dfa2ba9b518c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec  6 12:10:17 UTC 2016
+# Fri Jan 13 21:32:19 UTC 2017
 pkgbase = lib32-liblphobos
 	pkgdesc = D standard library (libphobos) for LDC compiler (32-bit)
-	pkgver = 0.15.1
+	pkgver = v1.1.0.beta3.r156.ga95f90f5
 	pkgrel = 1
 	url = https://github.com/ldc-developers/ldc
 	arch = x86_64
@@ -19,9 +19,8 @@ pkgbase = lib32-liblphobos
 	provides = d-runtime
 	provides = d-stdlib
 	replaces = lib32-liblphobos-devel
-	options = staticlibs
-	source = git://github.com/ldc-developers/ldc.git#tag=v0.15.1
-	md5sums = SKIP
+	source = git+https://github.com/ldc-developers/ldc#tag=a95f90f5172fa0c82cd4f6ff48ebb34464c90ea5
+	sha256sums = SKIP
 
 pkgname = lib32-liblphobos
 
diff --git a/PKGBUILD b/PKGBUILD
index a24e94cd49c2..99a77698aab9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $
-# Maintainer: Mihails Strasuns <public@dicebot.lv>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: Llewelyn Trahaearn <woefulderelict [at] gmail [dot] com>
+# Contributor: Mihails Strasuns <public [at] dicebot [dot] lv>
+# Contributor: Sven-Hendrik Haase <sh [at] lutzhaase [dot] com>
+
 pkgname=lib32-liblphobos
 groups=('dlang' 'dlang-ldc')
 provides=("d-runtime" "d-stdlib")
 replaces=("lib32-liblphobos-devel")
-pkgver=0.15.1
+pkgver=v1.1.0.beta3.r156.ga95f90f5
 pkgrel=1
 pkgdesc="D standard library (libphobos) for LDC compiler (32-bit)"
 arch=('x86_64')
@@ -13,36 +14,44 @@ url="https://github.com/ldc-developers/ldc"
 license=('BSD')
 depends=('ldc' 'lib32-curl' 'lib32-gcc-libs')
 makedepends=('git' 'llvm' 'libconfig' 'cmake')
-source=("git://github.com/ldc-developers/ldc.git#tag=v$pkgver")
-md5sums=("SKIP")
-options=("staticlibs")
+#source=("git+$url#tag=v${pkgver}")
+_commit=a95f90f5172fa0c82cd4f6ff48ebb34464c90ea5
+source=("git+$url#tag=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ldc
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+}
 
 build() {
-    cd "$srcdir"/ldc
+  cd ldc
+
+  git submodule update --init --recursive
 
-    git submodule update --init --recursive
+  [ -d build ] || mkdir build
+  cd build
 
-    mkdir build && cd build
-    cmake \
+  cmake \
     -DMULTILIB=ON \
-    -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
     -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc \
     -DBUILD_SHARED_LIBS=ON \
     ..
 
-    make
+  make
 }
 
 package() {
-	cd "$srcdir"/ldc
-
-    # licenses
-    install -D -m644 "$srcdir/ldc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd ldc/build
+  make install DESTDIR=$pkgdir
+  rm -rf "${pkgdir}"/{etc,usr/{bin,include,lib,share}}
 
-    # We don't want anything but the 32-bit libs
-    install -D -m644 $srcdir/ldc/build/lib32/libphobos2-ldc.so $pkgdir/usr/lib32/liblphobos2.so
-    install -D -m644 $srcdir/ldc/build/lib32/libdruntime-ldc.so $pkgdir/usr/lib32/libldruntime.so
-    install -D -m644 $srcdir/ldc/build/lib32/libphobos2-ldc-debug.so $pkgdir/usr/lib32/liblphobos2-debug.so
-    install -D -m644 $srcdir/ldc/build/lib32/libdruntime-ldc-debug.so $pkgdir/usr/lib32/libldruntime-debug.so
+  # License
+  install -D -m644 "${srcdir}/ldc/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }