diff --git a/testing/zig/APKBUILD b/testing/zig/APKBUILD index cd0115e17ebdd45c38830ae1cefcd042ccd2f818..b79c280576ad6fd10e03e5a73f7a77dd029c64a3 100644 --- a/testing/zig/APKBUILD +++ b/testing/zig/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=zig -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=0 pkgdesc="general-purpose programming language designed for robustness, optimality, and maintainability" url="https://ziglang.org/" @@ -11,8 +11,8 @@ license="MIT" provides="zig-dev=$pkgver-r$pkgrel" #subpackages="$pkgname-doc" # disable for now, fails on build options="!check" # fail, disable to unblock builders -makedepends="cmake clang-dev clang-libs llvm12-libs llvm-dev lld-dev libstdc++ - zlib-static libxml2-dev llvm12-static clang-static lld-static" +makedepends="cmake clang-dev clang-libs llvm13-libs llvm-dev lld-dev libstdc++ + zlib-static libxml2-dev llvm13-static clang-static lld-static" source="$pkgname-$pkgver.tar.gz::https://github.com/ziglang/zig/archive/$pkgver.tar.gz llvm-include.patch" @@ -27,6 +27,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ + -DZIG_VERSION="$pkgver" \ ${CMAKE_CROSSOPTS} \ .. make @@ -54,6 +55,6 @@ package() { } sha512sums=" -36bea566eee3dc5c00f2713cbc6616258dbadd3ee994749339f124f8b70c691cfe7fdce6a00194f879679ea417dadb3bcc244f8b79153957a426fea2d52caaf5 zig-0.8.1.tar.gz -2690960899f8404715e72e94b7ae7a0805f71e53d2f8b1de237708bc837e5e9817c48b4f053c6b84e6ef7a222268c22c107c22d31458106af50ba8c4c417f602 llvm-include.patch +a9dc5fea25dde511122056832449658b00dbcf6d6bbfe658b375968a7bdb06c690abbdfe00c1afcfa481442392b051dcef5a5a5e81d4ceb23fa98a866b900f37 zig-0.9.1.tar.gz +3d7a3f5ad1ba753bf8cffa7ddbb6785b9dec195121aad15b4ae66bac7123a84e0eb2cc347fcc8193b90a3e84abc99a8bfc9a77ab9205b14e6c0bdaaa20ce889a llvm-include.patch " diff --git a/testing/zig/llvm-include.patch b/testing/zig/llvm-include.patch index 99052058e8a369870d269fdbf96238c5b0697f50..7cefa8931566bfc98d544d6610cb3e097c5caae8 100644 --- a/testing/zig/llvm-include.patch +++ b/testing/zig/llvm-include.patch @@ -1,12 +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 +--- zig-0.9.1.orig/cmake/Findllvm.cmake ++++ zig-0.9.1/cmake/Findllvm.cmake @@ -12,6 +12,7 @@ - /usr/lib/llvm/12/include - /usr/lib/llvm-12/include - /usr/lib/llvm-12.0/include -+ /usr/lib/llvm12/include - /usr/local/llvm12/include - /usr/local/llvm120/include - /mingw64/include + /usr/lib/llvm/13/include + /usr/lib/llvm-13/include + /usr/lib/llvm-13.0/include ++ /usr/lib/llvm13/include + /usr/local/llvm13/include + /usr/local/llvm130/include + /usr/local/opt/llvm@13/include