Skip to content

Commit

Permalink
lang/zig: update to 0.9.1
Browse files Browse the repository at this point in the history 
Switch to pre-built docs, as this more than halves the build time and
also enables BUILD_AS_NON_ROOT with poudriere.

PR:             261396
Reported by:    kib
Sponsored by:   SkunkWerks, GmbH
  • Loading branch information
@dch
dch committed May 17, 2022
1 parent e3bb4af commit 23f56fe
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 48 deletions.
40 changes: 14 additions & 26 deletions lang/zig/Makefile
View file
@@ -1,7 +1,10 @@
PORTNAME= zig
DISTVERSION= 0.9.0
DISTVERSION= 0.9.1
CATEGORIES= lang
MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/
MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \
https://ziglang.org/builds/
# fetch prebuilt platform-independent docs
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} zig-freebsd-x86_64-${DISTVERSION}${EXTRACT_SUFX}

MAINTAINER= dch@FreeBSD.org
COMMENT= Language designed for robustness, optimality, and maintainability
Expand All @@ -14,14 +17,14 @@ ONLY_FOR_ARCHS_REASON= not yet supported

BUILD_DEPENDS= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}

CONFLICTS= zig
CONFLICTS= zig-devel

USES= cmake compiler:c++11-lang localbase:ldflags tar:xz

OPTIONS_DEFINE= STATIC
OPTIONS_DEFAULT= STATIC
OPTIONS_DEFINE= STATIC DOCS
OPTIONS_DEFAULT= STATIC DOCS

STATIC_DESC= sets ZIG_STATIC to avoid 800MiB LLVM dependencies
STATIC_DESC= sets ZIG_STATIC to avoid 800MiB LLVM runtime dependency

STATIC_RUN_DEPENDS_OFF= llvm${_LLVM_VER}>=0:devel/llvm${_LLVM_VER}
STATIC_CMAKE_BOOL= CMAKE_SKIP_INSTALL_RPATH ZIG_STATIC
Expand All @@ -33,30 +36,15 @@ _ZIG_BIN= ${STAGEDIR}${PREFIX}/bin/zig
post-configure-STATIC-on:
@${REINPLACE_CMD} 's/-Wl,-Bdynamic//' ${BUILD_WRKSRC}/build.ninja

post-build:
# Produce the experimental std lib documentation.
${MKDIR} ${WRKDIR}/cache ${WRKDIR}/doc
${WRKDIR}/.build/zig test ${WRKSRC}/lib/std/std.zig \
--cache-dir ${WRKDIR}/cache \
--global-cache-dir ${WRKDIR}/cache \
--zig-lib-dir ${WRKSRC}/lib \
-femit-docs=${WRKDIR}/doc \
-fno-emit-bin
${RM} ${WRKSRC}/lib/zig/std/zig-cache

post-install:
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/std
# langref cannot be generated until after install target has run
(cd ${WRKSRC} && ${_ZIG_BIN} run \
./doc/docgen.zig -- ${_ZIG_BIN} \
./doc/langref.html.in ${STAGEDIR}${DOCSDIR}/langref.html \
&& ${RM} ${STAGEDIR}/lib/zig/std/zig-cache)
${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' ${STAGEDIR}${DOCSDIR}/langref.html
.for f in data.js main.js index.html
${INSTALL_MAN} ${WRKDIR}/doc/${f} ${STAGEDIR}${DOCSDIR}/std/
.for f in langref.html std/data.js std/main.js std/index.html
${INSTALL_MAN} ${WRKDIR}/zig-freebsd-x86_64-${DISTVERSION}/doc/${f} \
${STAGEDIR}${DOCSDIR}/${f}
.endfor

do-test:
mkdir ${WRKDIR}/cache
(cd ${WRKSRC} && ${_ZIG_BIN} build test-behavior \
--cache-dir ${WRKDIR}/cache \
--global-cache-dir ${WRKDIR}/cache \
Expand Down
8 changes: 5 additions & 3 deletions lang/zig/distinfo
View file
@@ -1,3 +1,5 @@
TIMESTAMP = 1640104254
SHA256 (zig-0.9.0.tar.xz) = cd1be83b12f8269cc5965e59877b49fdd8fa638efb6995ac61eb4cea36a2e381
SIZE (zig-0.9.0.tar.xz) = 13928772
TIMESTAMP = 1652780969
SHA256 (zig-0.9.1.tar.xz) = 38cf4e84481f5facc766ba72783e7462e08d6d29a5d47e3b75c8ee3142485210
SIZE (zig-0.9.1.tar.xz) = 13940828
SHA256 (zig-freebsd-x86_64-0.9.1.tar.xz) = 4e06009bd3ede34b72757eec1b5b291b30aa0d5046dadd16ecb6b34a02411254
SIZE (zig-freebsd-x86_64-0.9.1.tar.xz) = 39028848
60 changes: 41 additions & 19 deletions lang/zig/pkg-plist
View file
Expand Up @@ -196,6 +196,7 @@ lib/zig/libc/glibc/bits/waitflags.h
lib/zig/libc/glibc/bits/waitstatus.h
lib/zig/libc/glibc/csu/abi-note.S
lib/zig/libc/glibc/csu/abi-tag.h
lib/zig/libc/glibc/csu/elf-init-2.33.c
lib/zig/libc/glibc/csu/errno.c
lib/zig/libc/glibc/debug/stack_chk_fail_local.c
lib/zig/libc/glibc/elf/elf.h
Expand Down Expand Up @@ -269,19 +270,22 @@ lib/zig/libc/glibc/sysdeps/aarch64/crti.S
lib/zig/libc/glibc/sysdeps/aarch64/crtn.S
lib/zig/libc/glibc/sysdeps/aarch64/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/aarch64/start-2.33.S
lib/zig/libc/glibc/sysdeps/aarch64/start.S
lib/zig/libc/glibc/sysdeps/aarch64/sysdep.h
lib/zig/libc/glibc/sysdeps/alpha/bits/endianness.h
lib/zig/libc/glibc/sysdeps/alpha/crti.S
lib/zig/libc/glibc/sysdeps/alpha/crtn.S
lib/zig/libc/glibc/sysdeps/alpha/dl-dtprocnum.h
lib/zig/libc/glibc/sysdeps/alpha/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/alpha/start-2.33.S
lib/zig/libc/glibc/sysdeps/alpha/start.S
lib/zig/libc/glibc/sysdeps/arc/sysdep.h
lib/zig/libc/glibc/sysdeps/arm/bits/endianness.h
lib/zig/libc/glibc/sysdeps/arm/crti.S
lib/zig/libc/glibc/sysdeps/arm/crtn.S
lib/zig/libc/glibc/sysdeps/arm/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/arm/start-2.33.S
lib/zig/libc/glibc/sysdeps/arm/start.S
lib/zig/libc/glibc/sysdeps/arm/sysdep.h
lib/zig/libc/glibc/sysdeps/csky/sysdep.h
Expand All @@ -303,6 +307,7 @@ lib/zig/libc/glibc/sysdeps/hppa/crti.S
lib/zig/libc/glibc/sysdeps/hppa/crtn.S
lib/zig/libc/glibc/sysdeps/hppa/entry.h
lib/zig/libc/glibc/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/hppa/start-2.33.S
lib/zig/libc/glibc/sysdeps/hppa/start.S
lib/zig/libc/glibc/sysdeps/hppa/sysdep.h
lib/zig/libc/glibc/sysdeps/htl/bits/pthread.h
Expand All @@ -312,6 +317,7 @@ lib/zig/libc/glibc/sysdeps/htl/pthread.h
lib/zig/libc/glibc/sysdeps/i386/crti.S
lib/zig/libc/glibc/sysdeps/i386/crtn.S
lib/zig/libc/glibc/sysdeps/i386/htl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/i386/start-2.33.S
lib/zig/libc/glibc/sysdeps/i386/start.S
lib/zig/libc/glibc/sysdeps/i386/symbol-hacks.h
lib/zig/libc/glibc/sysdeps/i386/sysdep.h
Expand All @@ -320,6 +326,7 @@ lib/zig/libc/glibc/sysdeps/ia64/crtn.S
lib/zig/libc/glibc/sysdeps/ia64/dl-dtprocnum.h
lib/zig/libc/glibc/sysdeps/ia64/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/ia64/entry.h
lib/zig/libc/glibc/sysdeps/ia64/start-2.33.S
lib/zig/libc/glibc/sysdeps/ia64/start.S
lib/zig/libc/glibc/sysdeps/ia64/sysdep.h
lib/zig/libc/glibc/sysdeps/m68k/bits/endianness.h
Expand All @@ -328,6 +335,7 @@ lib/zig/libc/glibc/sysdeps/m68k/crti.S
lib/zig/libc/glibc/sysdeps/m68k/crtn.S
lib/zig/libc/glibc/sysdeps/m68k/m680x0/sysdep.h
lib/zig/libc/glibc/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/m68k/start-2.33.S
lib/zig/libc/glibc/sysdeps/m68k/start.S
lib/zig/libc/glibc/sysdeps/m68k/symbol-hacks.h
lib/zig/libc/glibc/sysdeps/m68k/sysdep.h
Expand All @@ -338,6 +346,7 @@ lib/zig/libc/glibc/sysdeps/mach/sysdep.h
lib/zig/libc/glibc/sysdeps/microblaze/bits/endianness.h
lib/zig/libc/glibc/sysdeps/microblaze/crti.S
lib/zig/libc/glibc/sysdeps/microblaze/crtn.S
lib/zig/libc/glibc/sysdeps/microblaze/start-2.33.S
lib/zig/libc/glibc/sysdeps/microblaze/start.S
lib/zig/libc/glibc/sysdeps/microblaze/sysdep.h
lib/zig/libc/glibc/sysdeps/mips/bits/endianness.h
Expand All @@ -349,6 +358,7 @@ lib/zig/libc/glibc/sysdeps/mips/mips64/n32/crtn.S
lib/zig/libc/glibc/sysdeps/mips/mips64/n64/crti.S
lib/zig/libc/glibc/sysdeps/mips/mips64/n64/crtn.S
lib/zig/libc/glibc/sysdeps/mips/nptl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/mips/start-2.33.S
lib/zig/libc/glibc/sysdeps/mips/start.S
lib/zig/libc/glibc/sysdeps/nios2/sysdep.h
lib/zig/libc/glibc/sysdeps/nptl/bits/pthreadtypes.h
Expand All @@ -360,42 +370,50 @@ lib/zig/libc/glibc/sysdeps/powerpc/bits/endianness.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/crti.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/crtn.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/dl-dtprocnum.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/start-2.33.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/start.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/symbol-hacks.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc32/sysdep.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/crti.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/crtn.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/dl-dtprocnum.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/entry.h
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/start-2.33.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/start.S
lib/zig/libc/glibc/sysdeps/powerpc/powerpc64/sysdep.h
lib/zig/libc/glibc/sysdeps/powerpc/sysdep.h
lib/zig/libc/glibc/sysdeps/pthread/pthread_atfork.c
lib/zig/libc/glibc/sysdeps/riscv/bits/endianness.h
lib/zig/libc/glibc/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h
lib/zig/libc/glibc/sysdeps/riscv/start-2.33.S
lib/zig/libc/glibc/sysdeps/riscv/start.S
lib/zig/libc/glibc/sysdeps/s390/bits/endianness.h
lib/zig/libc/glibc/sysdeps/s390/s390-32/crti.S
lib/zig/libc/glibc/sysdeps/s390/s390-32/crtn.S
lib/zig/libc/glibc/sysdeps/s390/s390-32/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/s390/s390-32/start-2.33.S
lib/zig/libc/glibc/sysdeps/s390/s390-32/start.S
lib/zig/libc/glibc/sysdeps/s390/s390-32/symbol-hacks.h
lib/zig/libc/glibc/sysdeps/s390/s390-32/sysdep.h
lib/zig/libc/glibc/sysdeps/s390/s390-64/crti.S
lib/zig/libc/glibc/sysdeps/s390/s390-64/crtn.S
lib/zig/libc/glibc/sysdeps/s390/s390-64/start-2.33.S
lib/zig/libc/glibc/sysdeps/s390/s390-64/start.S
lib/zig/libc/glibc/sysdeps/s390/s390-64/sysdep.h
lib/zig/libc/glibc/sysdeps/sh/bits/endianness.h
lib/zig/libc/glibc/sysdeps/sh/crti.S
lib/zig/libc/glibc/sysdeps/sh/crtn.S
lib/zig/libc/glibc/sysdeps/sh/start-2.33.S
lib/zig/libc/glibc/sysdeps/sh/start.S
lib/zig/libc/glibc/sysdeps/sh/sysdep.h
lib/zig/libc/glibc/sysdeps/sparc/bits/endianness.h
lib/zig/libc/glibc/sysdeps/sparc/crti.S
lib/zig/libc/glibc/sysdeps/sparc/crtn.S
lib/zig/libc/glibc/sysdeps/sparc/dl-dtprocnum.h
lib/zig/libc/glibc/sysdeps/sparc/dl-sysdep.h
lib/zig/libc/glibc/sysdeps/sparc/sparc32/start-2.33.S
lib/zig/libc/glibc/sysdeps/sparc/sparc32/start.S
lib/zig/libc/glibc/sysdeps/sparc/sparc64/start-2.33.S
lib/zig/libc/glibc/sysdeps/sparc/sparc64/start.S
lib/zig/libc/glibc/sysdeps/sparc/sysdep.h
lib/zig/libc/glibc/sysdeps/unix/arm/sysdep.h
Expand Down Expand Up @@ -514,6 +532,7 @@ lib/zig/libc/glibc/sysdeps/unix/x86_64/sysdep.h
lib/zig/libc/glibc/sysdeps/wordsize-32/divdi3-symbol-hacks.h
lib/zig/libc/glibc/sysdeps/x86_64/crti.S
lib/zig/libc/glibc/sysdeps/x86_64/crtn.S
lib/zig/libc/glibc/sysdeps/x86_64/start-2.33.S
lib/zig/libc/glibc/sysdeps/x86_64/start.S
lib/zig/libc/glibc/sysdeps/x86_64/sysdep.h
lib/zig/libc/glibc/sysdeps/x86_64/x32/symbol-hacks.h
Expand Down Expand Up @@ -559,6 +578,25 @@ lib/zig/libc/include/aarch64_be-linux-gnu/sys/elf.h
lib/zig/libc/include/aarch64_be-linux-gnu/sys/ptrace.h
lib/zig/libc/include/aarch64_be-linux-gnu/sys/ucontext.h
lib/zig/libc/include/aarch64_be-linux-gnu/sys/user.h
lib/zig/libc/include/aarch64-linux-any/asm/auxvec.h
lib/zig/libc/include/aarch64-linux-any/asm/bitsperlong.h
lib/zig/libc/include/aarch64-linux-any/asm/bpf_perf_event.h
lib/zig/libc/include/aarch64-linux-any/asm/byteorder.h
lib/zig/libc/include/aarch64-linux-any/asm/fcntl.h
lib/zig/libc/include/aarch64-linux-any/asm/hwcap.h
lib/zig/libc/include/aarch64-linux-any/asm/kvm.h
lib/zig/libc/include/aarch64-linux-any/asm/mman.h
lib/zig/libc/include/aarch64-linux-any/asm/param.h
lib/zig/libc/include/aarch64-linux-any/asm/perf_regs.h
lib/zig/libc/include/aarch64-linux-any/asm/posix_types.h
lib/zig/libc/include/aarch64-linux-any/asm/ptrace.h
lib/zig/libc/include/aarch64-linux-any/asm/setup.h
lib/zig/libc/include/aarch64-linux-any/asm/sigcontext.h
lib/zig/libc/include/aarch64-linux-any/asm/signal.h
lib/zig/libc/include/aarch64-linux-any/asm/statfs.h
lib/zig/libc/include/aarch64-linux-any/asm/sve_context.h
lib/zig/libc/include/aarch64-linux-any/asm/ucontext.h
lib/zig/libc/include/aarch64-linux-any/asm/unistd.h
lib/zig/libc/include/aarch64-linux-gnu/bits/endianness.h
lib/zig/libc/include/aarch64-linux-gnu/bits/fcntl.h
lib/zig/libc/include/aarch64-linux-gnu/bits/fenv.h
Expand Down Expand Up @@ -3713,25 +3751,6 @@ lib/zig/libc/include/arm-linux-musl/bits/stat.h
lib/zig/libc/include/arm-linux-musl/bits/stdint.h
lib/zig/libc/include/arm-linux-musl/bits/syscall.h
lib/zig/libc/include/arm-linux-musl/bits/user.h
lib/zig/libc/include/arm64-linux-any/asm/auxvec.h
lib/zig/libc/include/arm64-linux-any/asm/bitsperlong.h
lib/zig/libc/include/arm64-linux-any/asm/bpf_perf_event.h
lib/zig/libc/include/arm64-linux-any/asm/byteorder.h
lib/zig/libc/include/arm64-linux-any/asm/fcntl.h
lib/zig/libc/include/arm64-linux-any/asm/hwcap.h
lib/zig/libc/include/arm64-linux-any/asm/kvm.h
lib/zig/libc/include/arm64-linux-any/asm/mman.h
lib/zig/libc/include/arm64-linux-any/asm/param.h
lib/zig/libc/include/arm64-linux-any/asm/perf_regs.h
lib/zig/libc/include/arm64-linux-any/asm/posix_types.h
lib/zig/libc/include/arm64-linux-any/asm/ptrace.h
lib/zig/libc/include/arm64-linux-any/asm/setup.h
lib/zig/libc/include/arm64-linux-any/asm/sigcontext.h
lib/zig/libc/include/arm64-linux-any/asm/signal.h
lib/zig/libc/include/arm64-linux-any/asm/statfs.h
lib/zig/libc/include/arm64-linux-any/asm/sve_context.h
lib/zig/libc/include/arm64-linux-any/asm/ucontext.h
lib/zig/libc/include/arm64-linux-any/asm/unistd.h
lib/zig/libc/include/armeb-linux-gnueabi/bits/endianness.h
lib/zig/libc/include/armeb-linux-gnueabi/bits/fcntl.h
lib/zig/libc/include/armeb-linux-gnueabi/bits/fenv.h
Expand Down Expand Up @@ -12420,6 +12439,8 @@ lib/zig/std/build/WriteFileStep.zig
lib/zig/std/builtin.zig
lib/zig/std/c.zig
lib/zig/std/c/darwin.zig
lib/zig/std/c/darwin/aarch64.zig
lib/zig/std/c/darwin/x86_64.zig
lib/zig/std/c/dragonfly.zig
lib/zig/std/c/emscripten.zig
lib/zig/std/c/freebsd.zig
Expand Down Expand Up @@ -12682,6 +12703,7 @@ lib/zig/std/os/plan9.zig
lib/zig/std/os/plan9/x86_64.zig
lib/zig/std/os/test.zig
lib/zig/std/os/uefi.zig
lib/zig/std/os/uefi/pool_allocator.zig
lib/zig/std/os/uefi/protocols.zig
lib/zig/std/os/uefi/protocols/absolute_pointer_protocol.zig
lib/zig/std/os/uefi/protocols/device_path_protocol.zig
Expand Down

0 comments on commit 23f56fe

Please sign in to comment.