Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714131488295400"
MIME-Version: 1.0
Date: Fri, 26 Apr 2024 11:38:08 +0000
From: "nikita" <nikita@netbsd.org>
Subject: CVS commit: pkgsrc/lang/zig
To: pkgsrc-changes@NetBSD.org
Reply-To: nikita@netbsd.org
Message-Id: <20240426113808.0B64CFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714131488295400
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nikita
Date:		Fri Apr 26 11:38:07 UTC 2024

Modified Files:
	pkgsrc/lang/zig: Makefile application.mk

Log Message:
zig: use ZIG_GLOBAL_CACHE_DIR and ZIG_LOCAL_CACHE_DIR for zig and
applications, remove old comments.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/zig/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/zig/application.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1714131488295400
Content-Disposition: inline
Content-Length: 2233
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/zig/Makefile
diff -u pkgsrc/lang/zig/Makefile:1.35 pkgsrc/lang/zig/Makefile:1.36
--- pkgsrc/lang/zig/Makefile:1.35	Fri Apr 26 09:57:34 2024
+++ pkgsrc/lang/zig/Makefile	Fri Apr 26 11:38:07 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2024/04/26 09:57:34 nikita Exp $
+# $NetBSD: Makefile,v 1.36 2024/04/26 11:38:07 nikita Exp $
 
 DISTNAME=	zig-0.12.0
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://ziglang.org/download/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@@ -24,15 +25,14 @@ CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_P
 CMAKE_CONFIGURE_ARGS+=	-DZIG_TARGET_MCPU=baseline
 CMAKE_CONFIGURE_ARGS+=	-DZIG_PIE=ON
 
+MAKE_ENV+=	ZIG_GLOBAL_CACHE_DIR=${WRKDIR}/zig-global-cache
+MAKE_ENV+=	ZIG_LOCAL_CACHE_DIR=${WRKDIR}/zig-local-cache
+
 CHECK_PORTABILITY_SKIP+=	ci/azure/macos_script
 BUILDLINK_TRANSFORM+=		rm:-Werror
 
 UNLIMIT_RESOURCES=	stacksize
 
-# \todo: There is currently an issue building this as a PIE
-#MKPIE_SUPPORTED=	no
-# RELRO checks fail for this package at the moment
-#RELRO_SUPPORTED=	no
 # TODO: /usr/bin/env + /bin/env in lib/std/zig/system.zig
 
 # after install, because the zig binary ends up in paths like

Index: pkgsrc/lang/zig/application.mk
diff -u pkgsrc/lang/zig/application.mk:1.8 pkgsrc/lang/zig/application.mk:1.9
--- pkgsrc/lang/zig/application.mk:1.8	Wed Apr 24 20:48:30 2024
+++ pkgsrc/lang/zig/application.mk	Fri Apr 26 11:38:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: application.mk,v 1.8 2024/04/24 20:48:30 nikita Exp $
+# $NetBSD: application.mk,v 1.9 2024/04/26 11:38:07 nikita Exp $
 #
 # Common logic to handle zig packages
 # This is only usable if they include a 'build.zig' file
@@ -30,7 +30,8 @@ ZIGSTRIP?=		yes
 TOOL_DEPENDS+=		zig-[0-9]*:../../lang/zig
 USE_LANGUAGES=		c
 
-#MAKE_ENV+=		ZIG_GLOBAL_CACHE_DIR=${WRKSRC}/tmp
+MAKE_ENV+=		ZIG_GLOBAL_CACHE_DIR=${WRKDIR}/zig-gobal-cache
+MAKE_ENV+=		ZIG_LOCAL_CACHE_DIR=${WRKDIR}/zig-local-cache
 
 .if ${ZIGPIE:Uyes:M[yY][eE][sS]}
 ZIGBUILDARGS+=		-Dpie=true
@@ -43,7 +44,6 @@ ZIGBUILDARGS+=		-Dstrip=true
 .endif
 
 do-build:
-	mkdir ${WRKSRC}/tmp
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} zig build ${ZIGBUILDMODE} ${ZIGCPUMODE} ${ZIGBUILDARGS} --prefix ${DESTDIR}${PREFIX}
 
 do-install:


--_----------=_1714131488295400--