diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /community/dmd | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'community/dmd')
| -rw-r--r-- | community/dmd/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/dmd/soname.diff | 15 |
2 files changed, 7 insertions, 25 deletions
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 72037c483..f1d7b0640 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98383 2013-10-09 11:50:00Z dicebot $ +# $Id: PKGBUILD 100583 2013-11-06 11:18:29Z dicebot $ # Maintainer: Mihails Strasunse <public@dicebot.lv> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> @@ -9,21 +9,19 @@ 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') 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 @@ build() { 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_dmd() { 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 @@ package_dtools() { 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 } diff --git a/community/dmd/soname.diff b/community/dmd/soname.diff deleted file mode 100644 index 7d155a52a..000000000 --- a/community/dmd/soname.diff +++ /dev/null @@ -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))) |