CVS commit: pkgsrc/lang/zig

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Aug  5 13:27:17 UTC 2025

Modified Files:
        pkgsrc/lang/zig: Makefile distinfo
        pkgsrc/lang/zig/patches: patch-CMakeLists.txt

Log Message:
lang/zig: Remove WRKREF from bin/zig

* RUNPATH under NetBSD/amd64 10.99.15 is PREFIX:PREFIX
  and it is still strange.
* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/lang/zig/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/zig/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/zig/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/lang/zig/Makefile
diff -u pkgsrc/lang/zig/Makefile:1.49 pkgsrc/lang/zig/Makefile:1.50
--- pkgsrc/lang/zig/Makefile:1.49       Sun May 25 13:02:37 2025
+++ pkgsrc/lang/zig/Makefile    Tue Aug  5 13:27:17 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2025/05/25 13:02:37 adam Exp $
+# $NetBSD: Makefile,v 1.50 2025/08/05 13:27:17 ryoon Exp $
 
 DISTNAME=      zig-0.14.1
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://ziglang.org/download/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz
@@ -15,6 +16,10 @@ USE_CXX_FEATURES+=   c++17
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            bash:run
 
+# Avoid WRKREF in RUNPATH of bin/zig.
+CONFIGURE_ENV+=                CMAKE_PREFIX_PATH=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX}
+
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+= -DZIG_SHARED_LLVM=ON
 # avoid full-cpu-features available to build host,

Index: pkgsrc/lang/zig/distinfo
diff -u pkgsrc/lang/zig/distinfo:1.18 pkgsrc/lang/zig/distinfo:1.19
--- pkgsrc/lang/zig/distinfo:1.18       Sun May 25 13:02:37 2025
+++ pkgsrc/lang/zig/distinfo    Tue Aug  5 13:27:17 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2025/05/25 13:02:37 adam Exp $
+$NetBSD: distinfo,v 1.19 2025/08/05 13:27:17 ryoon Exp $
 
 BLAKE2s (zig-0.14.1.tar.xz) = 0206af0c78a64c408d45512d5989a03f45319b3ea4b5ceb6164a4f7fc6b9df6b
 SHA512 (zig-0.14.1.tar.xz) = b2b96f241216a46503af95a1175c967ac869391cc87fcb42db2c29d9d513e7ab19c4f4ced2c078481c36aea95f412f3162a8b319aa86b5e2462af567554e8216
 Size (zig-0.14.1.tar.xz) = 17787696 bytes
-SHA1 (patch-CMakeLists.txt) = 50eda03554c8fc4c357d86eac85595f3b7027a62
+SHA1 (patch-CMakeLists.txt) = ec28a4df428643728cc6d4d69cde32c0ad44620c

Index: pkgsrc/lang/zig/patches/patch-CMakeLists.txt
diff -u pkgsrc/lang/zig/patches/patch-CMakeLists.txt:1.5 pkgsrc/lang/zig/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/lang/zig/patches/patch-CMakeLists.txt:1.5    Mon Jun  9 18:07:33 2025
+++ pkgsrc/lang/zig/patches/patch-CMakeLists.txt        Tue Aug  5 13:27:17 2025
@@ -1,12 +1,30 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2025/06/09 18:07:33 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2025/08/05 13:27:17 ryoon Exp $
+
+Do not append a buildlinked directory to ZIG_CMAKE_PREFIX_PATH to avoid WRKREF
+in bin/zig.
 
 Skip stage3 during build to:
-* spedd up buidling
+* speed up buidling
 * avoid work directory reference in zig's RUNPATH.
 
---- CMakeLists.txt.orig        2025-03-04 22:35:21.000000000 +0000
+--- CMakeLists.txt.orig        2025-05-23 04:31:41.000000000 +0000
 +++ CMakeLists.txt
-@@ -971,18 +971,9 @@ if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" S
+@@ -18,13 +18,7 @@ endif()
+ # cache variable. Furthermore, the environment variable follows the system path
+ # separator, such as ':' on POSIX and ';' on Windows, but the cache variable
+ # follows CMake's array behavior, i.e. always ';' for a separator.
+-list(APPEND ZIG_CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}")
+-if(WIN32)
+-  list(APPEND ZIG_CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
+-else()
+-  string(REGEX REPLACE ":" ";" ZIG_CMAKE_PREFIX_PATH_STRING "$ENV{CMAKE_PREFIX_PATH}")
+-  list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}")
+-endif()
++set(ZIG_CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH}")
+ 
+ list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+@@ -978,18 +972,9 @@ if(MINGW AND "${ZIG_HOST_TARGET_ARCH}" S
  endif()