Skip to content

Commit

Permalink
lang/zig: pet port after 0.11.0 update
Browse files Browse the repository at this point in the history
- fix optional DOCS build for PR270007
- fix pkg-plist sorting
- clean up work dirs to help docs build
- remove stale cmake flags

PR:		270007
  • Loading branch information
dch committed Jan 4, 2024
1 parent 5182994 commit 4b6d52c
Show file tree
Hide file tree
Showing 3 changed files with 790 additions and 787 deletions.
9 changes: 6 additions & 3 deletions lang/zig/Makefile
@@ -1,6 +1,6 @@
PORTNAME= zig
DISTVERSION= 0.11.0
PORTREVISION?= 0
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= https://ziglang.org/download/${DISTVERSION}/ \
https://ziglang.org/builds/
Expand All @@ -27,8 +27,8 @@ LIB_DEPENDS= liblzma.so:archivers/lzma \
libzstd.so:archivers/zstd

USES= cmake compiler:c++11-lang localbase:ldflags tar:xz
CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG
CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere
CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG

CONFLICTS_INSTALL= zig010

Expand All @@ -38,7 +38,7 @@ OPTIONS_DEFAULT= DOCS
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
STATIC_CMAKE_BOOL= ZIG_STATIC
STATIC_LDFLAGS= -licudata -licuuc -llzma -lm -lmd -lxml2 -lz -lzstd

_LLVM_VER= 16
Expand All @@ -48,6 +48,9 @@ post-configure-STATIC-on:
@${REINPLACE_CMD} 's/-Wl,-Bdynamic//' \
${BUILD_WRKSRC}/build.ninja

post-build:
@${RM} -rf ${STAGEDIR}/wrkdirs

post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/std
.for f in langref.html std/data.js std/main.js std/index.html
Expand Down
2 changes: 1 addition & 1 deletion lang/zig/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
--- CMakeLists.txt.orig 2023-08-03 18:22:03 UTC
--- CMakeLists.txt.orig 2023-09-18 18:35:13 UTC
+++ CMakeLists.txt
@@ -877,6 +877,7 @@ set(ZIG_BUILD_ARGS
"-Dtarget=${ZIG_TARGET_TRIPLE}"
Expand Down

0 comments on commit 4b6d52c

Please sign in to comment.