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

[Dan Printzell]

    Date: Monday, January 13, 2020 @ 15:01:00
  Author: wild
Revision: 552350

upgpkg: dmd 1:2.090.0-1: Updated to 2.090.0

Modified:
  dmd/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-13 15:00:23 UTC (rev 552349)
+++ PKGBUILD	2020-01-13 15:01:00 UTC (rev 552350)
@@ -11,12 +11,12 @@
 pkgdesc='D programming language compiler and standard library'
 groups=('dlang' 'dlang-dmd')
 pkgbase=dmd
-pkgver=2.089.0
+pkgver=2.090.0
 pkgrel=1
 epoch=1
 arch=('x86_64')
 url='https://www.dlang.org'
-makedepends=('git' 'ldc' 'strip-nondeterminism')
+makedepends=('git' 'ldc')
 source=("git+https://github.com/dlang/dmd.git#tag=v$pkgver"
         "git+https://github.com/dlang/druntime.git#tag=v$pkgver"
         "git+https://github.com/dlang/phobos.git#tag=v$pkgver"
@@ -27,7 +27,7 @@
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            'ee1b12b407bfff972d997a1ddd749dd2d74d09f7a3751e439058847c63645e24'
+            '17b407da594ad8fe96e7a8937434aaec2511b8623f05c3c27a5bc48d63a468a5'
             'SKIP'
             '3d639e89528fed1da90006f4dfb2b0fdc41308da5a96d953381ff4ccf257c035'
             '4b7b8722b3fa11082f0f332397b1b66c85b30ce773c43c3fedcba5768a1484b1')
@@ -39,19 +39,12 @@
     tar xfJ "dmd.$pkgver.linux.tar.xz" dmd2/html
 
     # Make sure the version is not -dirty
-    sed -i "s/result.status == 0/false/" "$srcdir"/dmd/config.d
+    sed -i "s/\.git/.nope/" "$srcdir"/dmd/src/build.d
 
     # Add $LDFLAGS and $CXXFLAGS to the compilation
     # '-link-defaultlib-shared=false' statically links dmd to liblphobos
-    sed -i "/^CXXFLAGS :=/ a $CXXFLAGS \\\\" "$srcdir"/dmd/src/posix.mak
-    sed -i "/^DFLAGS=$/ a override DFLAGS += -link-defaultlib-shared=false -L=\"$LDFLAGS\" -flto=full" "$srcdir"/dmd/src/posix.mak
-
-    _linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g")
-    sed -i "/^DFLAGS=$/ a override DFLAGS += $_linkflags" "$srcdir"/phobos/posix.mak
-
-    # Fix new incomplete build.d file
-    _builddflags=$(echo -n $_linkflags | sed "s/ -L/\", \"-L/g")
-    sed -i "/\~= dflags/a flags[\"DFLAGS\"] ~= [\"-link-defaultlib-shared=false\", \"${_builddflags}\"];" "$srcdir"/dmd/src/build.d
+    _dflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g")
+    sed -i "s/--called-from-make/& CXXFLAGS=\"$CXXFLAGS\" DFLAGS='-link-defaultlib-shared=false $(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g") -flto=full'/" "$srcdir"/dmd/src/posix.mak
 }
 
 build() {
@@ -66,7 +59,7 @@
 
     # This requires object.d to compile, thus need to be after druntime is built
     cd "$srcdir"/dmd
-    make -C docs DMD="$srcdir"/dmd/generated/linux/release/*/dmd OTHER_MAN_PAGES=man/man5/dmd.conf.5
+    make -C docs DMD=ldmd2
 }
 
 package_dmd() {
@@ -90,7 +83,7 @@
 
     mkdir -p "$pkgdir"/usr/share/man/man1
     mkdir -p "$pkgdir"/usr/share/man/man5
-    cp -r generated/docs/man/man1/* "$pkgdir"/usr/share/man/man1/
+    cp generated/docs/man/man1/dmd.1 "$pkgdir"/usr/share/man/man1/
     cp -r generated/docs/man/man5/* "$pkgdir"/usr/share/man/man5/
 
     install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
@@ -130,8 +123,6 @@
     mkdir -p "$pkgdir"/usr/lib
     cp -P $(find "$srcdir"/{druntime,phobos}/generated/linux/release/ \( -iname "*.a" -a \! -iname "*.so.a" \) -o \( -iname "*.so*" -a \! -iname "*.o" -a \! -iname "*.a" \) ) "$pkgdir"/usr/lib
 
-    strip-nondeterminism "$pkgdir"/usr/lib/libphobos2.a
-
     mkdir -p "$pkgdir"/usr/include/dlang/dmd
     cp -r "$srcdir"/phobos/{*.d,etc,std} "$pkgdir"/usr/include/dlang/dmd
     cp -r "$srcdir"/druntime/import/* "$pkgdir"/usr/include/dlang/dmd/