[arch-commits] Commit in dmd/trunk (PKGBUILD soname.diff)

[Михаил Страшун]

    Date: Wednesday, November 6, 2013 @ 12:18:11
  Author: dicebot
Revision: 100582

upgpkg: dmd 2.064.2-1

dmd -> 2.064

Modified:
  dmd/trunk/PKGBUILD
Deleted:
  dmd/trunk/soname.diff

-------------+
 PKGBUILD    |   15 ++++++---------
 soname.diff |   15 ---------------
 2 files changed, 6 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-06 10:52:39 UTC (rev 100581)
+++ PKGBUILD	2013-11-06 11:18:11 UTC (rev 100582)
@@ -9,8 +9,8 @@
 pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
-pkgver=2.063.2
-pkgrel=4
+pkgver=2.064.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.dlang.org"
 makedepends=('git' 'gcc' 'make')
@@ -17,13 +17,11 @@
 source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver"
         "git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver"
         "git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver"
-        "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver" 
-        "soname.diff")
+        "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver")
 sha1sums=('SKIP'
           'SKIP'
           'SKIP'
-          'SKIP'
-          '5a2198e8a024e1e6494034da569f0df18fabcf9d')
+          'SKIP')
 
 [[ $CARCH == "x86_64" ]] && _archbits="64"
 [[ $CARCH == "i686" ]] && _archbits="32"
@@ -36,8 +34,6 @@
     make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
 
     cd $srcdir/phobos
-    # will be in upstream in next release but making naming change as early as possible
-    git apply $srcdir/soname.diff
     make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
 
     cd $srcdir/tools
@@ -82,6 +78,7 @@
 package_libphobos-devel() {
     pkgdesc="The Phobos standard library for D programming language. Modules and static library."
     depends=("dmd")
+    options=("staticlibs")
     provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
     license=("custom")
 
@@ -123,5 +120,5 @@
     ln -s dtools-dustmite usr/bin/dustmite
 
     # same Boost license as Phobos
-    install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE-phobos
+    install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE
 }

Deleted: soname.diff
===================================================================
--- soname.diff	2013-11-06 10:52:39 UTC (rev 100581)
+++ soname.diff	2013-11-06 11:18:11 UTC (rev 100582)
@@ -1,15 +0,0 @@
-diff --git a/posix.mak b/posix.mak
-index 8fd953e..3776bb4 100644
---- a/posix.mak
-+++ b/posix.mak
-@@ -153,8 +153,8 @@ DDOC=$(DMD)
- VERSION=../dmd/VERSION
- 
- # Set SONAME, the name of the shared library.
--# The awk script will produce the last 2 digits of the version string, i.e. 2.063 produces 63
--SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$NF + 0 }' $(VERSION))
-+# The awk script will return the second group without leading zeros of the version string, i.e. 2.063.2 produces 63
-+SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$2 + 0 }' $(VERSION))
- 
- # Set LIB, the ultimate target
- ifeq (,$(findstring win,$(OS)))