diff options
| author | Marc Tiehuis <marc@tiehu.is> | 2019-07-25 21:18:28 +1200 |
|---|---|---|
| committer | Marc Tiehuis <marc@tiehu.is> | 2019-07-25 21:18:28 +1200 |
| commit | f7f53fb1c3bbdb328ee505a12ca67c404fa27519 (patch) | |
| tree | ff0f66afa4b6cdcc30cebf825a1db814c3c4fb17 | |
| parent | Remove stage2 artifact patch (diff) | |
| download | zig-git-f7f53fb1c3bbdb328ee505a12ca67c404fa27519.tar.xz | |
Update for breaking install changes
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | force_dynamic_llvm.patch | 13 |
3 files changed, 5 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = zig-git pkgdesc = a programming language prioritizing robustness, optimality, and clarity - pkgver = 0.4.0.r184.g40fe6afd + pkgver = 0.4.0.r935.g9e11f67f0 pkgrel = 1 url = http://ziglang.org arch = i686 @@ -13,9 +13,7 @@ pkgbase = zig-git provides = zig conflicts = zig source = git://github.com/zig-lang/zig.git - source = force_dynamic_llvm.patch md5sums = SKIP - md5sums = 9a935ede50ab8f1a789349fc3b760c1c pkgname = zig-git @@ -1,7 +1,7 @@ # Maintainer: Marc Tiehuis <marctiehuis at gmail.com> pkgname=zig-git -pkgver=0.4.0.r184.g40fe6afd +pkgver=0.4.0.r935.g9e11f67f0 pkgrel=1 pkgdesc="a programming language prioritizing robustness, optimality, and clarity" arch=('i686' 'x86_64') @@ -11,13 +11,8 @@ depends=('clang' 'llvm') makedepends=('cmake' 'git') provides=(zig) conflicts=(zig) -source=("git://github.com/zig-lang/zig.git" 'force_dynamic_llvm.patch') -md5sums=('SKIP' '9a935ede50ab8f1a789349fc3b760c1c') - -prepare() { - cd "$srcdir/$provides" - patch -Np1 -i "$srcdir/force_dynamic_llvm.patch" -} +source=("git://github.com/zig-lang/zig.git") +md5sums=('SKIP') pkgver() { cd "$srcdir/$provides" @@ -29,7 +24,7 @@ build() { mkdir -p build cd build cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr - make + make DESTDIR=. } check() { diff --git a/force_dynamic_llvm.patch b/force_dynamic_llvm.patch deleted file mode 100644 index c92f302..0000000 --- a/force_dynamic_llvm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake -index 021c3c6f..82b435af 100644 ---- a/cmake/Findllvm.cmake -+++ b/cmake/Findllvm.cmake -@@ -15,7 +15,7 @@ find_program(LLVM_CONFIG_EXE - "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-6.0.0/bin") - --if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC) -+if(false) - execute_process( - COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static - OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES |