CVS commit: [pkgsrc-2024Q4] pkgsrc/lang/go123

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Jan  7 07:54:34 UTC 2025

Modified Files:
        pkgsrc/lang/go123 [pkgsrc-2024Q4]: Makefile PLIST distinfo

Log Message:
Pullup ticket #6924 - requested by bsiegert
lang/go123: build fix

Revisions pulled up:
- lang/go123/Makefile                                           1.6
- lang/go123/PLIST                                              1.5
- lang/go123/distinfo                                           1.6

---
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Thu Jan  2 19:53:12 UTC 2025

   Modified Files:
           pkgsrc/lang/go123: Makefile PLIST distinfo

   Log Message:
   go123: stop requiring /proc on NetBSD

   This adds a patch (taken from Go 1.24 development) to use a sysctl
   instead of /proc to find the path of the executable, and thus the
   files for the standard library.

   Earlier versions of Go (including 1.22) had the directory where the
   standard library is installed baked in to the binaries as
   GOROOT_FINAL. In the interest of portability, this is now determined
   at runtime. In NetBSD, this used to use /proc/self/exe, however many
   build sandboxes do not have /proc mounted.

   With this change, /proc is no longer required for building Go code.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.2.1 pkgsrc/lang/go123/Makefile \
    pkgsrc/lang/go123/distinfo
cvs rdiff -u -r1.4 -r1.4.2.1 pkgsrc/lang/go123/PLIST

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

Modified files:

Index: pkgsrc/lang/go123/Makefile
diff -u pkgsrc/lang/go123/Makefile:1.5 pkgsrc/lang/go123/Makefile:1.5.2.1
--- pkgsrc/lang/go123/Makefile:1.5      Wed Dec  4 18:51:39 2024
+++ pkgsrc/lang/go123/Makefile  Tue Jan  7 07:54:34 2025
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2024/12/04 18:51:39 bsiegert Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2025/01/07 07:54:34 maya Exp $
 
+PKGREVISION=   1
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=     120
 .include "../../lang/go/bootstrap.mk"
@@ -19,6 +20,11 @@ LICENSE=     modified-bsd
 WRKSRC=                ${WRKDIR}/go
 USE_TOOLS+=    bash:run perl:run pax
 
+# Patch to stop requiring /proc to be mounted on NetBSD
+PATCH_SITES=           https://github.com/golang/go/commit/
+PATCHFILES=            80344887818a2321296ce7fa71cca8ca2520611d.diff
+PATCH_DIST_STRIP=      -p1
+
 # cgo compiles under TMPDIR
 TMPDIR?=       /tmp
 BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
@@ -94,6 +100,9 @@ PRINT_PLIST_AWK+=    /^bin\/gofmt${GOVERSSU
 post-extract:
        ${RM} -r -f ${WRKSRC}/test/fixedbugs/issue27836*
 
+post-patch:
+       ${RM} -f ${WRKSRC}/src/os/*.orig_dist
+
 do-build:
        cd ${WRKSRC}/src && \
                env \
Index: pkgsrc/lang/go123/distinfo
diff -u pkgsrc/lang/go123/distinfo:1.5 pkgsrc/lang/go123/distinfo:1.5.2.1
--- pkgsrc/lang/go123/distinfo:1.5      Wed Dec  4 18:51:39 2024
+++ pkgsrc/lang/go123/distinfo  Tue Jan  7 07:54:34 2025
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2024/12/04 18:51:39 bsiegert Exp $
+$NetBSD: distinfo,v 1.5.2.1 2025/01/07 07:54:34 maya Exp $
 
+BLAKE2s (80344887818a2321296ce7fa71cca8ca2520611d.diff) = 80c77c55780bbd3b61f54698a5790169566a5c1c142ea9cf6b3de4ff261375f6
+SHA512 (80344887818a2321296ce7fa71cca8ca2520611d.diff) = a72fe9c2bba6191df1fb796fe55cc0fea2eb1809f7a4f148230a8be798e3b6820405e48a92a57da59d8fbe23d7d624b49cef9761852a62b4e81ba9dcaa7deaa6
+Size (80344887818a2321296ce7fa71cca8ca2520611d.diff) = 3273 bytes
 BLAKE2s (go1.23.4.src.tar.gz) = 23d99679a436a8dc39cf40ce3e6a4610e018037bea4ccc3ed8230f702117b7e5
 SHA512 (go1.23.4.src.tar.gz) = 5d1cce76b2cbdf628f86a1a8185a07f362becee053cb4270281520e77b36e3908faeaf5b2a6266e61dec9866dc1f3791f77e8dc1bf5f8beaf858c138d0e18c22
 Size (go1.23.4.src.tar.gz) = 28177188 bytes

Index: pkgsrc/lang/go123/PLIST
diff -u pkgsrc/lang/go123/PLIST:1.4 pkgsrc/lang/go123/PLIST:1.4.2.1
--- pkgsrc/lang/go123/PLIST:1.4 Fri Nov  8 19:46:59 2024
+++ pkgsrc/lang/go123/PLIST     Tue Jan  7 07:54:34 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/11/08 19:46:59 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.4.2.1 2025/01/07 07:54:34 maya Exp $
 bin/go${GOVERSSUFFIX}
 bin/gofmt${GOVERSSUFFIX}
 go123/CONTRIBUTING.md
@@ -7862,6 +7862,7 @@ go123/src/os/executable.go
 go123/src/os/executable_darwin.go
 go123/src/os/executable_dragonfly.go
 go123/src/os/executable_freebsd.go
+go123/src/os/executable_netbsd.go
 go123/src/os/executable_path.go
 go123/src/os/executable_plan9.go
 go123/src/os/executable_procfs.go