[pkgsrc/trunk]: pkgsrc/lang/go117 go117: Fix bootstrap issue on illumos platf...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a237ebde7e0
branches:  trunk
changeset: 458031:6a237ebde7e0
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Sep 07 13:31:14 2021 +0000

description:
go117: Fix bootstrap issue on illumos platforms.

diffstat:

 lang/go117/Makefile                                        |   6 +++-
 lang/go117/distinfo                                        |   3 +-
 lang/go117/patches/patch-src_os_user_getgrouplist__unix.go |  19 ++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (58 lines):

diff -r 32b6a4554d35 -r 6a237ebde7e0 lang/go117/Makefile
--- a/lang/go117/Makefile       Tue Sep 07 11:07:12 2021 +0000
+++ b/lang/go117/Makefile       Tue Sep 07 13:31:14 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/08/22 13:10:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/07 13:31:14 jperkin Exp $
 
 .include "../../lang/go/version.mk"
 .include "../../lang/go/bootstrap.mk"
@@ -18,6 +18,10 @@
 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}
diff -r 32b6a4554d35 -r 6a237ebde7e0 lang/go117/distinfo
--- a/lang/go117/distinfo       Tue Sep 07 11:07:12 2021 +0000
+++ b/lang/go117/distinfo       Tue Sep 07 13:31:14 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2021/08/22 13:10:18 bsiegert Exp $
+$NetBSD: distinfo,v 1.2 2021/09/07 13:31:14 jperkin Exp $
 
 SHA1 (go1.17.src.tar.gz) = dd6eb7b66af665cba58adc606bd7502194ad4462
 RMD160 (go1.17.src.tar.gz) = 296e9b97d97b2f9c793085ccf3835504965bd276
@@ -8,4 +8,5 @@
 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) = 18199c795d3590380976af15dadf3c5a4a2aeb47
 SHA1 (patch-src_syscall_zsysnum__solaris__amd64.go) = ec28a0fa37ba9599ec1651c8e9337a2efc48a26b
diff -r 32b6a4554d35 -r 6a237ebde7e0 lang/go117/patches/patch-src_os_user_getgrouplist__unix.go
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/go117/patches/patch-src_os_user_getgrouplist__unix.go        Tue Sep 07 13:31:14 2021 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_os_user_getgrouplist__unix.go,v 1.1 2021/09/07 13:31:15 jperkin Exp $
+
+Until we switch to a native illumos bootstrap we will need to work around this
+file being bootstrapped from GOHOSTOS=solaris.
+
+--- src/os/user/getgrouplist_unix.go.orig      2021-08-16 16:29:54.000000000 +0000
++++ src/os/user/getgrouplist_unix.go
+@@ -15,7 +15,11 @@ package user
+ #include <grp.h>
+ 
+ static int mygetgrouplist(const char* user, gid_t group, gid_t* groups, int* ngroups) {
++#ifdef ILLUMOS
++      return 0;
++#else
+       return getgrouplist(user, group, groups, ngroups);
++#endif
+ }
+ */
+ import "C"