diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2021-03-15 11:50:53 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2021-03-15 11:50:53 +0100 |
| commit | e4213c4b08944b71970dcb63ae85d2dd5716bc4a (patch) | |
| tree | eae8a9e2e489745a080af65ec23bd94891a017f1 | |
| parent | 00b68a31e989988d3846903160e437bd59e20eaf (diff) | |
testing/zig: upgrade to 0.7.1
Fixes #12270
| -rw-r--r-- | testing/zig/APKBUILD | 20 | ||||
| -rw-r--r-- | testing/zig/llvm-include.patch | 12 |
2 files changed, 22 insertions, 10 deletions
diff --git a/testing/zig/APKBUILD b/testing/zig/APKBUILD index eb8821e9e46..162e112ecff 100644 --- a/testing/zig/APKBUILD +++ b/testing/zig/APKBUILD @@ -2,18 +2,18 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=zig -pkgver=0.6.0 -pkgrel=2 +pkgver=0.7.1 +pkgrel=0 pkgdesc="general-purpose programming language designed for robustness, optimality, and maintainability" url="https://ziglang.org/" -arch="" # Doesn't work with LLVM11 yet -#arch="x86_64 aarch64" +arch="x86_64 aarch64" license="MIT" provides="zig-dev=$pkgver-r$pkgrel" subpackages="$pkgname-doc" -makedepends="cmake clang-dev clang-libs llvm10-libs llvm-dev lld-dev libstdc++ - zlib-static libxml2-dev llvm10-static clang-static lld-static" -source="$pkgname-$pkgver.tar.gz::https://github.com/ziglang/zig/archive/$pkgver.tar.gz" +makedepends="cmake clang-dev clang-libs llvm11-libs llvm-dev lld-dev libstdc++ + zlib-static libxml2-dev llvm11-static clang-static lld-static" +source="$pkgname-$pkgver.tar.gz::https://github.com/ziglang/zig/archive/$pkgver.tar.gz + llvm-include.patch" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -38,8 +38,7 @@ check() { -Dskip-release-small \ -Dskip-release-fast \ -Dskip-non-native \ - -Dskip-libc \ - -Dskip-self-hosted + -Dskip-libc } package() { @@ -52,4 +51,5 @@ package() { "$pkgdir"/usr/share/doc/$pkgname/langref.html } -sha512sums="062f3437a080c1d823558c834dd143222e3f0537cc4256c4fa687ed94078a4312be60e402b0effa916ce8305a3482e1736a93c3ec4275fc5a526a0d78a3b1a47 zig-0.6.0.tar.gz" +sha512sums="ad0b36f7b40481aca03940adfd42d34a724922993fc29a23a80412dc087ca6ce4876a400dc9bb7da455564521a88ea205c218988759ff6c56251a08232bfa41a zig-0.7.1.tar.gz +8bee0c8f3765af327866a14175e0bd6903c3164145002435b6110970bf6ccc88713ea9146ec202325d9d65148367122dd00fda0c9d78971a13c644e0f0714640 llvm-include.patch" diff --git a/testing/zig/llvm-include.patch b/testing/zig/llvm-include.patch new file mode 100644 index 00000000000..27caaa756b5 --- /dev/null +++ b/testing/zig/llvm-include.patch @@ -0,0 +1,12 @@ +Our llvm include path is not in the include list tried by default. + +--- zig-0.7.1.orig/cmake/Findllvm.cmake ++++ zig-0.7.1/cmake/Findllvm.cmake +@@ -12,6 +12,7 @@ + /usr/lib/llvm/11/include + /usr/lib/llvm-11/include + /usr/lib/llvm-11.0/include ++ /usr/lib/llvm11/include + /usr/local/llvm11/include + /usr/local/llvm110/include + /mingw64/include |