hellium6 · hellium6 · Mar 20, 2025 · Mar 6, 2025 · Mar 9, 2025 · Mar 14, 2025
diff --git a/README.md b/README.md
@@ -49,6 +49,9 @@ cd /usr/pkgsrc/lang/clang19
 make install
 
 cd /usr/pkgsrc/lang/zig-master
+### For 0.14.0 stable:
+### cd /usr/pkgsrc/lang/zig-0.14.0
+
 ## update DISTNAME in Makefile according to download URL
 ## read comment in the file for details
 ## to get latest master or dev download:
@@ -115,6 +118,12 @@ $ zig version
 0.13.0
 $ zig-master version
 0.14.0
+### For lang/zig-0.14.0 you'd have to run zig-0.14.0 or
+### if you've changed DISTNAME, type "zig" and press tab twice for hint.
+### Example:
+### $ zig-0.14.0-dev.3462 version
+### 0.14.0-dev.3462+edabcf619
+
 ### typing zig-master every time is boring, so...
 $ alias zig=zig-master
 ### above can be added in ~/.bashrc to do this automatically on startup
@@ -139,6 +148,8 @@ Example of uninstalling a package:
 ```sh
 $ pkg_info -a | grep ^zig
 zig-master-0.14.0-dev.3462+edabcf619 Programming language designed for robustness and clarity
+### For lang/zig-0.14.0 the output might be something like:
+### zig-isolated0140-0.14.0 Programming language designed for robustness and clarity (prefix isolated)
 $ doas pkg_delete zig-master-0.14.0-dev.3462+edabcf619
 ```
 

diff --git a/pkgsrc/lang/zig-0.14.0/DESCR b/pkgsrc/lang/zig-0.14.0/DESCR
@@ -0,0 +1,14 @@
+Zig is an open-source programming language designed for robustness,
+optimality, and clarity.
+
+* Robust - behavior is correct even for edge cases such as out
+  of memory.
+* Optimal - write programs the best way they can
+  behave and perform.
+* Clear - precisely communicate your intent
+  to the compiler and other programmers. The language imposes a
+  low overhead to reading code.
+
+(This modified package installs in a different prefix than usual:
+${PREFIX}/zig-${PKGVERSION_NOREV} which might be something like:
+/usr/pkg/zig-0.14.0)
diff --git a/pkgsrc/lang/zig-0.14.0/Makefile b/pkgsrc/lang/zig-0.14.0/Makefile
@@ -0,0 +1,149 @@
+# $NetBSD: Makefile,v 1.42 2024/08/10 10:19:01 nia Exp $
+
+## If you want to use another commit, update DISTNAME according to the
+## 0.14.0 download URL and run "make makesum" after that.
+## Example: If the URL is:
+## https://ziglang.org/builds/zig-0.14.0-dev.3462+edabcf619.tar.xz
+## then this value would be: zig-0.14.0-dev.3462+edabcf619
+## Meaning, filename minus the .tar.xz extension.
+## If any pkgsrc package you need depends on application.mk, e.g. zls,
+## changes might be needed on application.mk file as well.
+DISTNAME=	zig-0.14.0
+## Want to make this (a) a separate package than lang/zig and (b) we
+## want to be able to install different commits of the same version.
+## For example 0.14.0 (stable) and 0.14.0-dev.3462+edabcf619 (unstable).
+## Having the package name as "zig" won't let us install another version
+## with the same name. We need a unique package name based on version in
+## the DISTNAME so that it allows both to be installed.
+##
+## We prepare a version suffix code to make the name unique.
+## Example values:
+## - "zig-0.14.0-dev.3462+edabcf619" becomes "0140dev3462"
+## - "zig-0.14.0" becomes "0140"
+APPEND_VER=	${DISTNAME:S/zig-//:S/.//g:S/-//:C/\+.*$//}
+## Finally appending the version code creates our unique package name.
+## e.g. "zig-isolated0140" or "zig-isolated0140dev3462+edabcf619". Both
+## should be able to be installed at the same time.
+PKGNAME=	${DISTNAME:S/zig-/zig-isolated${APPEND_VER}-/}
+PKGREVISION=	4
+CATEGORIES=	lang
+## https://ziglang.org/builds/ is the official
+MASTER_SITES=	https://ziglang.org/builds/
+## Alternate mirror
+#MASTER_SITES=	https://zig.linus.dev/zig/
+EXTRACT_SUFX=	.tar.xz
+## Used mainly for /usr/pkg/xx directory and binary symlink name.
+## e.g. If this is "zig-0.14.0" (a) zig will be installed in
+## /usr/pkg/zig-0.14.0, (b) symlinked as /usr/pkg/bin/zig-0.14.0 and
+## (c) can be used by running "zig-0.14.0". "+" causes Zig binary to not
+## be available on double tab press. We remove "+" as fix and following
+## chars to make it shorter.
+PACKAGE_SLUG=	${DISTNAME:C/\+.*$//}
+
+MAINTAINER=	[email protected]
+HOMEPAGE=	https://ziglang.org/
+COMMENT=	Programming language designed for robustness and clarity (prefix isolated)
+LICENSE=	mit
+
+# Fails to build in chroot on netbsd: https://github.com/ziglang/zig/issues/19756
+USE_CXX_FEATURES+=	c++17
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		bash:run
+
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
+CMAKE_CONFIGURE_ARGS+=	-DZIG_SHARED_LLVM=ON
+## Seperate prefix (may not work, needs post-configure target below)
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${DESTDIR}${PREFIX}/${PACKAGE_SLUG}
+# avoid full-cu-features available to build host,
+# in other words ensure that we run everywhere
+CMAKE_CONFIGURE_ARGS+=	-DZIG_TARGET_MCPU=baseline
+#CMAKE_CONFIGURE_ARGS+=	-DZIG_PIE=ON
+
+## Make it see files from the path of lang/llvm19
+.include "../../lang/llvm19/isolatedversion.mk"
+LDFLAGS+=		-L${LLVM_ISOLATED_PREFIX}/lib -Wl,-R${LLVM_ISOLATED_PREFIX}/lib
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_CXX_LINK_FLAGS=${LDFLAGS:Q}
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_C_LINK_FLAGS=${LDFLAGS:Q}
+## Because zig build can't find libxml etc. if not set to /usr/pkg
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX}
+## Print every CMake command being run (for debugging/troubleshooting)
+MAKE_ENV+=	VERBOSE=1
+## Fix for "libclang-cpp.so.xx.y" not found.
+## CMake things don't seem to work here because it is done with zig's
+## build system. Also MAKE_ENV doesn't send the vars (esp.
+## LD_LIBRARY_PATH) to zig build. So we need to prepend LD_LIBRARY_PATH
+## in cmake/install.cmake (see post-configure target below)
+MAKE_ENV+=	LD_LIBRARY_PATH=${LLVM_ISOLATED_PREFIX}/lib:/usr/pkg/lib:/usr/lib
+MAKE_ENV+=	LDFLAGS=-Wl,-R${LLVM_ISOLATED_PREFIX}/lib
+MAKE_ENV+=	LDFLAGS=-L/usr/pkg/lib
+
+MAKE_ENV+=	ZIG_GLOBAL_CACHE_DIR=${WRKDIR}/${PACKAGE_SLUG}-global-cache
+MAKE_ENV+=	ZIG_LOCAL_CACHE_DIR=${WRKDIR}/${PACKAGE_SLUG}-local-cache
+
+CHECK_PORTABILITY_SKIP+=	ci/azure/macos_script
+BUILDLINK_TRANSFORM+=		rm:-Werror
+
+UNLIMIT_RESOURCES=	stacksize
+
+# again, sigh...
+RELRO_SUPPORTED=	no
+MKPIE_SUPPORTED=	no
+# TODO: /usr/bin/env + /bin/env in lib/std/zig/system.zig
+
+pre-configure:
+	## - Make zig build see LD_LIBRARY_PATH (e.g. path to
+	## "libclang-cpp.so.xx.y")
+	## - Set version string (esp. for dev builds)
+	## - Make stage3 zig build process (build.zig) see the path
+	${SED} -i'_orig' \
+		-e '1{h;s,.*,set(ENV{LD_LIBRARY_PATH} "'${LLVM_ISOLATED_PREFIX}'/lib:/usr/pkg/lib:/usr/lib:$$\ENV{LD_LIBRARY_PATH}")\n,;G;}' \
+		-e '1{h;s,.*,set(ENV{LIBRARY_PATH} "'${LLVM_ISOLATED_PREFIX}'/lib:/usr/pkg/lib:/usr/lib:$$\ENV{LIBRARY_PATH}")\n,;G;}' \
+		-e '1{h;s,.*,set(ENV{LDFLAGS} "-Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib -L'${LLVM_ISOLATED_PREFIX}'/lib $$\ENV{LDFLAGS}")\n,;G;}' \
+		-e '/set(ZIG_VERSION/ s,set(ZIG_VERSION "",set(ZIG_VERSION "${DISTNAME:S/zig-//}",' \
+		-e '/$${CMAKE_PREFIX_PATH}/ s,^,list(APPEND ZIG_CMAKE_PREFIX_PATH "${LLVM_ISOLATED_PREFIX}")\n,' \
+		${WRKDIR}/${DISTNAME}/CMakeLists.txt
+	## Fix paths when lang/clang is already installed on system
+	${SED} -i'_orig' \
+		-e '1{h;s,.*,set(LLVM_INCLUDE_DIRS "'${LLVM_ISOLATED_PREFIX}'/include:$$\{LLVM_INCLUDE_DIRS}")\n,;G;}' \
+		-e '1{h;s,.*,set(LLVM_LIBDIRS "'${LLVM_ISOLATED_PREFIX}'/lib:$$\{LLVM_LIBDIRS}")\n,;G;}' \
+		-e '1{h;s,.*,set(CMAKE_PREFIX_PATH "'${LLVM_ISOLATED_PREFIX}'")\n,;G;}' \
+		${WRKDIR}/${DISTNAME}/cmake/Findclang.cmake
+
+post-configure:
+	## Workaround for making CMake see the isolated prefix
+	${FIND} ${WRKSRC} -name CMakeCache\.txt -exec sed -i'_orig' \
+		-e 's,^CMAKE_INSTALL_PREFIX:PATH=.*,CMAKE_INSTALL_PREFIX:PATH='${PREFIX}/${PACKAGE_SLUG}',' \
+		-e '/^CMAKE_CXX_FLAGS:/ s,$$, -I'${LLVM_ISOLATED_PREFIX}'/include,' \
+		-e '/^CMAKE_CXX_LINK_FLAGS:/ s,$$, -L'${LLVM_ISOLATED_PREFIX}'/lib -Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib,' \
+		-e '/^CMAKE_C_FLAGS:/ s,$$, -I'${LLVM_ISOLATED_PREFIX}'/include,' \
+		-e '/^CMAKE_EXE_LINKER_FLAGS:/ s,$$, -L'${LLVM_ISOLATED_PREFIX}'/lib -Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib,' \
+		-e '/^CMAKE_MODULE_LINKER_FLAGS:/ s,$$, -L'${LLVM_ISOLATED_PREFIX}'/lib -Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib,' \
+		-e '/^CMAKE_SHARED_LINKER_FLAGS:/ s,$$, -L'${LLVM_ISOLATED_PREFIX}'/lib -Wl\,-R'${LLVM_ISOLATED_PREFIX}'/lib,' \
+		-e '$$s,$$,\nCMAKE_INSTALL_RPATH:PATH='${LLVM_ISOLATED_PREFIX}'/lib,' \
+		-e '$$s,$$,\nCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON,' \
+		{} \;
+	## Hardcode the path so that executing the linked
+	## /usr/pkg/bin/${PACKAGE_SLUG} file doesn't say "unable to find zig
+	## installation directory"
+	${SED} -i'_orig' -e 's,= self_exe_path;,= "/usr/pkg/${PACKAGE_SLUG}/bin";\n    _ = self_exe_path;,' ${WRKDIR}/${DISTNAME}/src/introspect.zig
+
+post-install:
+	## Binary link for isolated install
+	${MKDIR} -p ${DESTDIR}${PREFIX}/bin
+	${LN} -sf ${PREFIX}/${PACKAGE_SLUG}/bin/zig ${DESTDIR}${PREFIX}/bin/${PACKAGE_SLUG}
+
+# after install, because the zig binary ends up in paths like
+# ./zig-0.10.1/zig-cache/o/e6445b80597d6bc8fe865e7254800ac9/zig
+# unless we want to run find for the executable here?
+do-test:
+	mkdir ${WRKDIR}/cache
+	cd ${WRKSRC} && \
+		${DESTDIR}${PREFIX}/bin/${PACKAGE_SLUG} build test-behavior \
+		--cache-dir ${WRKDIR}/cache --global-cache-dir ${WRKDIR}/cache \
+		--zig-lib-dir ${WRKSRC}/lib
+
+.include "../../devel/cmake/build.mk"
+.include "../../devel/lld19/buildlink3.mk"
+.include "../../lang/clang19/buildlink3.mk"
+.include "../../lang/llvm19/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"