From 43bcff2ab379c0398747e3e92c3ae6a951b90ce2 Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Sat, 29 May 2021 10:46:24 +0100 Subject: [PATCH] zig: switch to master, requre llvm req and don't install GNU stuff --- pkgs/zig/build.sh | 16 +++++++++++++--- pkgs/zig/llvm-req-arch.patch | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 pkgs/zig/llvm-req-arch.patch diff --git a/pkgs/zig/build.sh b/pkgs/zig/build.sh index 8757512..7a00e9d 100644 --- a/pkgs/zig/build.sh +++ b/pkgs/zig/build.sh @@ -1,10 +1,13 @@ pkgname=zig -pkgver=0.7.1 +pkgver=master fetch() { - curl -L "https://ziglang.org/download/$pkgver/zig-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz - tar -xf $pkgname-$pkgver.tar.xz + curl -L "https://github.com/ziglang/zig/archive/refs/heads/master.tar.gz" -o $pkgname-$pkgver.tar.gz + tar -xf $pkgname-$pkgver.tar.gz mkdir $pkgname-$pkgver/build + cp ../llvm-req-arch.patch . + cd $pkgname-$pkgver + patch -p1 < ../llvm-req-arch.patch } build() { @@ -21,6 +24,13 @@ package() { cd $pkgname-$pkgver cd build DESTDIR=$pkgdir samu install + rm -rf $pkgdir/usr/lib/zig/libc/glibc + rm -rf $pkgdir/usr/lib/zig/libc/mingw + rm -rf $pkgdir/usr/lib/zig/libc/wasi + + rm -rf $pkgdir/usr/lib/zig/libc/include/*gnu* + rm -rf $pkgdir/usr/lib/zig/libc/include/*glibc* + rm -rf $pkgdir/usr/lib/zig/libc/include/*windows* } license() { diff --git a/pkgs/zig/llvm-req-arch.patch b/pkgs/zig/llvm-req-arch.patch new file mode 100644 index 0000000..cfc9d17 --- /dev/null +++ b/pkgs/zig/llvm-req-arch.patch @@ -0,0 +1,25 @@ +--- a/cmake/Findllvm.cmake ++++ b/cmake/Findllvm.cmake +@@ -107,22 +107,8 @@ + endif() + endfunction(NEED_TARGET) + NEED_TARGET("AArch64") +- NEED_TARGET("AMDGPU") +- NEED_TARGET("ARM") +- NEED_TARGET("AVR") +- NEED_TARGET("BPF") +- NEED_TARGET("Hexagon") +- NEED_TARGET("Lanai") +- NEED_TARGET("Mips") +- NEED_TARGET("MSP430") +- NEED_TARGET("NVPTX") +- NEED_TARGET("PowerPC") + NEED_TARGET("RISCV") +- NEED_TARGET("Sparc") +- NEED_TARGET("SystemZ") +- NEED_TARGET("WebAssembly") + NEED_TARGET("X86") +- NEED_TARGET("XCore") + + if(ZIG_STATIC_LLVM) + execute_process(