From a20d9a66b4481881d5d4dc227cf8fc89c5e91252 Mon Sep 17 00:00:00 2001 From: Marc Tiehuis Date: Tue, 23 May 2017 23:06:34 +1200 Subject: Update with newer build commands + cleanup --- .SRCINFO | 9 +++++---- PKGBUILD | 43 +++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0ed8d4c..2908133 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,17 +1,18 @@ pkgbase = zig-git - pkgdesc = System programming language intended to replace C - pkgver = 0.0.0r747.2ed949a + pkgdesc = a programming language prioritizing robustness, optimality, and clarity + pkgver = 0.0.0r1377.1c8fe44 pkgrel = 1 - url = http://ziglang.org/ + url = http://ziglang.org arch = i686 arch = x86_64 license = MIT makedepends = cmake depends = llvm depends = clang + depends = lld provides = zig conflicts = zig - source = zig::git+git://github.com/andrewrk/zig.git#branch=master + source = git://github.com/andrewrk/zig.git#branch=master md5sums = SKIP pkgname = zig-git diff --git a/PKGBUILD b/PKGBUILD index 3e5869d..0b65403 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,36 +1,39 @@ +# Maintainer: Marc Tiehuis + pkgname=zig-git -provides=(zig) -conflicts=(zig) -pkgver=0.0.0r747.2ed949a +pkgver=0.0.0r1377.1c8fe44 pkgrel=1 -pkgdesc="System programming language intended to replace C" +pkgdesc="a programming language prioritizing robustness, optimality, and clarity" arch=('i686' 'x86_64') -url="http://ziglang.org/" +url='http://ziglang.org' license=('MIT') -depends=(llvm clang) -makedepends=(cmake) -source=("${provides}::git+git://github.com/andrewrk/zig.git#branch=master") +depends=('llvm' 'clang' 'lld') +makedepends=('cmake') +provides=(zig) +conflicts=(zig) +source=("git://github.com/andrewrk/zig.git#branch=master") md5sums=('SKIP') -pkgver() { - cd "$srcdir/$provides" - - printf "0.0.0r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +prepare() { + cd "$srcdir/$provides" + printf "0.0.0r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } - -build() -{ +build() { cd "$srcdir/$provides" - mkdir -p build cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) \ + -DZIG_LIBC_INCLUDE_DIR=$(echo -n | cc -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") \ + -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $(cc -print-file-name=crtbegin.o)) make } -package() -{ +package() { cd "$srcdir/$provides/build" + install -Dm644 "$srcdir/$provides/LICENSE" "$pkgdir/usr/share/licenses/$provides/LICENSE" make DESTDIR="$pkgdir" install -} \ No newline at end of file +} -- cgit v1.2.1