CVS commit: pkgsrc/lang/go117

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep 14 10:12:16 UTC 2021

Modified Files:
        pkgsrc/lang/go117: Makefile distinfo
Removed Files:
        pkgsrc/lang/go117/patches: patch-src_os_user_getgrouplist__unix.go

Log Message:
go117: Rework illumos getgrouplist hack.

The previous change only worked for the build of go itself, any dependencies
that used the same go code were broken.  Fixes www/gitea and others.

Needs to be fixed properly by creating a native illumos bootstrap kit.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/go117/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/go117/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/go117/patches/patch-src_os_user_getgrouplist__unix.go

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

Modified files:

Index: pkgsrc/lang/go117/Makefile
diff -u pkgsrc/lang/go117/Makefile:1.2 pkgsrc/lang/go117/Makefile:1.3
--- pkgsrc/lang/go117/Makefile:1.2      Tue Sep  7 13:31:14 2021
+++ pkgsrc/lang/go117/Makefile  Tue Sep 14 10:12:16 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2021/09/07 13:31:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2021/09/14 10:12:16 jperkin Exp $
 
 .include "../../lang/go/version.mk"
 .include "../../lang/go/bootstrap.mk"
@@ -18,10 +18,6 @@ LICENSE=     modified-bsd
 WRKSRC=                ${WRKDIR}/go
 USE_TOOLS+=    bash:run perl:run pax
 
-.if ${OPSYS} == "SunOS" && ${OS_VARIANT} != "Solaris"
-CWRAPPERS_APPEND.cc+=  -DILLUMOS
-.endif
-
 # cgo compiles under TMPDIR
 TMPDIR?=       /tmp
 BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
@@ -76,6 +72,15 @@ SUBST_STAGE.paths=   pre-configure
 SUBST_FILES.paths=     src/crypto/x509/root_solaris.go
 SUBST_VARS.paths=      PKG_SYSCONFDIR
 
+# Required until we bootstrap from a native illumos kit.  This is obviously
+# terrible and should be fixed properly.
+.if ${OPSYS} == "SunOS" && ${OS_VARIANT} != "Solaris"
+SUBST_CLASSES+=                grplist
+SUBST_STAGE.grplist=   pre-configure
+SUBST_FILES.grplist=   src/os/user/getgrouplist_unix.go
+SUBST_SED.grplist=     -e 's,return getgrouplist.*,return 0;,'
+.endif
+
 PLIST_SUBST+=  GOVERSSUFFIX=${GOVERSSUFFIX}
 
 PLIST_VARS+=   pty route

Index: pkgsrc/lang/go117/distinfo
diff -u pkgsrc/lang/go117/distinfo:1.3 pkgsrc/lang/go117/distinfo:1.4
--- pkgsrc/lang/go117/distinfo:1.3      Tue Sep  7 13:31:47 2021
+++ pkgsrc/lang/go117/distinfo  Tue Sep 14 10:12:16 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2021/09/07 13:31:47 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2021/09/14 10:12:16 jperkin Exp $
 
 SHA1 (go1.17.src.tar.gz) = dd6eb7b66af665cba58adc606bd7502194ad4462
 RMD160 (go1.17.src.tar.gz) = 296e9b97d97b2f9c793085ccf3835504965bd276
@@ -8,5 +8,4 @@ SHA1 (patch-misc_ios_clangwrap.sh) = 0a0
 SHA1 (patch-src_cmd_dist_util.go) = 2d9c2f59e27672d56f5f1a0e3f9d5101a05546a7
 SHA1 (patch-src_crypto_x509_root__bsd.go) = 27636e0d8c121ccec6c46a3a82cd0e0469473a6e
 SHA1 (patch-src_crypto_x509_root__solaris.go) = cce8d78a5a3712a0e7a620ead232a779e4a4b21e
-SHA1 (patch-src_os_user_getgrouplist__unix.go) = cc977d20d2c41a894bf8dfaed38195b7b47e088d
 SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b