use static linking by default

2 files changed, 21 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af02db29b39f..9dc83e0070ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon May 30 02:09:30 UTC 2016
+# Mon Jun  6 20:15:32 UTC 2016
 pkgbase = ldc-git
 	pkgdesc = A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2
-	pkgver = v1.0.0.beta1.146.ge058ab7
+	pkgver = v1.0.0.beta1.167.gd9b012b
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ldc-developers/ldc
@@ -17,6 +17,11 @@ pkgbase = ldc-git
 	makedepends = sed
 	makedepends = dmd
 	depends = libconfig
+	depends = curl
+	provides = d-compiler d-runtime
+	provides = d-stdlib
+	conflicts = liblphobos-git
+	backup = etc/ldc2-git.conf
 	source = git://github.com/ldc-developers/ldc.git
 	source = git://github.com/ldc-developers/druntime.git
 	source = git://github.com/ldc-developers/phobos.git
@@ -29,13 +34,4 @@ pkgbase = ldc-git
 	sha256sums = 3e3b275f8c04d427b67c989cee591bff96f6701b118f29bb928fc9e3794b1dd7
 
 pkgname = ldc-git
-	depends = liblphobos-git
-	depends = libconfig
-	provides = d-compiler
-	backup = etc/ldc2-git.conf
-
-pkgname = liblphobos-git
-	depends = curl
-	provides = d-runtime
-	provides = d-stdlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 600c74431a03..1ea9c075fd47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,21 @@
 # Maintainer: zfo <zfoofz1@gmail.com>
 # Contributor: Mihails Strasuns <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=('ldc-git' 'liblphobos-git')
+pkgname=('ldc-git')
 _gitname=ldc
 _pkgname=ldc-git
 groups=('dlang' 'dlang-ldc')
-pkgver=v1.0.0.beta1.146.ge058ab7
+pkgver=v1.0.0.beta1.167.gd9b012b
 epoch=1
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
 url="https://github.com/ldc-developers/ldc"
 license=('BSD')
-depends=('libconfig')
-#conflicts=('ldc')
+depends=('libconfig' 'curl')
+backup=("etc/ldc2-git.conf")
+provides=("d-compiler d-runtime" "d-stdlib")
+conflicts=('liblphobos-git')
 #provides=('ldc')
 makedepends=('git' 'cmake' 'llvm' 'sed' 'dmd')
 source=("git://github.com/ldc-developers/ldc.git"
@@ -62,13 +64,13 @@ build() {
 
     mkdir -p build && cd build
 
+	# this is the git version - static linking by default
     # don't use ArchLinux LDFLAGS (#1494)
-    LDFLAGS="" cmake \
+    LDFLAGS="-static-libstdc++ -Wl,-rpath,\$ORIGIN" cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_EXE_LINKER_FLAGS='-static-libstdc++ -Wl,-rpath,\$ORIGIN' \
     -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc-git \
-    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_SHARED_LIBS=OFF \
     ..
 
     #-DCMAKE_SKIP_RPATH=ON \
@@ -76,11 +78,7 @@ build() {
     make install DESTDIR=$srcdir/tmp_install_dir
 }
 
-package_ldc-git() {
-    depends=('liblphobos-git' 'libconfig')
-    backup=("etc/ldc2-git.conf")
-    provides=("d-compiler")
-
+package() {
     cd $srcdir/tmp_install_dir
 
     # binaries
@@ -95,24 +93,12 @@ package_ldc-git() {
 
     # default configuration files
     install -D -m644 $srcdir/ldc2.conf $pkgdir/etc/ldc2-git.conf
-}
-
-package_liblphobos-git() {
-    provides=("d-runtime" "d-stdlib")
-    #replaces=("liblphobos-devel" "liblphobos")
-    #conflicts=("liblphobos-devel" "liblphobos" "ldc")
-    depends=("curl")
-
-    # licenses
-    install -D -m644 $srcdir/ldc/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-
-    cd $srcdir/tmp_install_dir
 
     # libraries
-    install -D -m644 ./usr/lib/libphobos2-ldc.so $pkgdir/usr/lib/liblphobos2-git.so
-    install -D -m644 ./usr/lib/libdruntime-ldc.so $pkgdir/usr/lib/libldruntime-git.so
-    install -D -m644 ./usr/lib/libphobos2-ldc-debug.so $pkgdir/usr/lib/liblphobos2-debug-git.so
-    install -D -m644 ./usr/lib/libdruntime-ldc-debug.so $pkgdir/usr/lib/libldruntime-debug-git.so
+    install -D -m644 ./usr/lib/libphobos2-ldc.a $pkgdir/usr/lib/liblphobos2-git.a
+    install -D -m644 ./usr/lib/libdruntime-ldc.a $pkgdir/usr/lib/libldruntime-git.a
+    install -D -m644 ./usr/lib/libphobos2-ldc-debug.a $pkgdir/usr/lib/liblphobos2-debug-git.a
+    install -D -m644 ./usr/lib/libdruntime-ldc-debug.a $pkgdir/usr/lib/libldruntime-debug-git.a
 
     # imports
     mkdir -p $pkgdir/usr/include/dlang