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

[Daurnimator]

    Date: Tuesday, April 14, 2020 @ 14:53:22
  Author: daurnimator
Revision: 614068

upgpkg: zig 0.6.0-1

Modified:
  zig/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-14 12:02:07 UTC (rev 614067)
+++ PKGBUILD	2020-04-14 14:53:22 UTC (rev 614068)
@@ -2,9 +2,9 @@
 # Contributor: Marc Tiehuis <marctiehuis at gmail.com>
 
 pkgname=zig
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
-pkgdesc='a general-purpose programming language designed for robustness, optimality, and maintainability'
+pkgdesc='a general-purpose programming language and toolchain for maintaining robust, optimal, and reusable software'
 arch=('x86_64')
 url='https://ziglang.org/'
 license=('MIT')
@@ -11,7 +11,7 @@
 depends=('clang' 'llvm-libs' 'lld')
 makedepends=('cmake' 'llvm')
 source=("https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz")
-sha256sums=('55ae16960f152bcb9cf98b4f8570902d0e559a141abf927f0d3555b7cc838a31')
+sha256sums=('5d167dc19354282dd35dd17b38e99e1763713b9be8a4ba9e9e69284e059e7204')
 
 build() {
     cd "$pkgname-$pkgver"
@@ -20,15 +20,10 @@
     cd build
     # The zig CMakeLists uses build type Debug if not set
     # override it back to None so makepkg env vars are respected
-    # Zig vendors LLD as a workaround for an upstream bug when targetting OSX
-    # - https://github.com/ziglang/zig/issues/662
-    # - https://bugs.llvm.org/show_bug.cgi?id=32254
-    # - http://lists.llvm.org/pipermail/llvm-dev/2017-August/116904.html
     cmake \
         -DCMAKE_BUILD_TYPE=None \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DZIG_FORCE_EXTERNAL_LLD=ON \
-        -DZIG_SKIP_INSTALL_LIB_FILES=ON \
+        -DZIG_PREFER_CLANG_CPP_DYLIB=ON \
         ..
     make
 }
@@ -44,14 +39,5 @@
 
     install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-    cd build
-    # Need to re-configure so lib files are installed.
-    # See https://github.com/ziglang/zig/issues/2221#issuecomment-535335570
-    cmake \
-        -DCMAKE_BUILD_TYPE=None \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DZIG_FORCE_EXTERNAL_LLD=ON \
-        -DZIG_SKIP_INSTALL_LIB_FILES=OFF \
-        ..
-    make DESTDIR="$pkgdir" install
+    make -C build DESTDIR="$pkgdir" install
 }