From c6ab8406195645c71dff9b5ef306e0da25c6e2b983b3e01c053881f3fa04acb6 Mon Sep 17 00:00:00 2001 From: Jeff Kowalczyk Date: Fri, 8 Apr 2022 19:10:37 +0000 Subject: [PATCH] Accepting request 967904 from home:jfkw:branches:devel:languages:go - Template gcc-go.patch to substitute gcc_go_version and eliminate multiple similar patches each with hardcoded gcc go binary name. gcc-go.patch inserts gcc-go binary name e.g. go-8 to compensate for current lack of gcc-go update-alternatives usage. * add gcc-go.patch * drop gcc6-go.patch * drop gcc7-go.patch - For SLE-12 set gcc_go_version to 8 to bootstrap using gcc8-go. gcc6-go and gcc7-go no longer successfully bootstrap go1.17 or go1.18 on SLE-12 aarch64 ppc64le or s390x. * gcc6-go fails with errors e.g. libnoder.a(_go_.o):(.toc+0x0): undefined reference to `__go_pimt__I4_DiagFrN4_boolee3 OBS-URL: https://build.opensuse.org/request/show/967904 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go1.18?expand=0&rev=13 --- gcc-go.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc-go.patch b/gcc-go.patch index 725c27c..7fa6a85 100644 --- a/gcc-go.patch +++ b/gcc-go.patch @@ -48,9 +48,9 @@ Index: go/src/make.rc =================================================================== --- go.orig/src/make.rc +++ go/src/make.rc -@@ -60,7 +60,7 @@ GOROOT = `{cd .. && pwd} - if(! ~ $#GOROOT_BOOTSTRAP 1) - GOROOT_BOOTSTRAP = $home/go1.4 +@@ -60,7 +60,7 @@ if(! ~ $#GOROOT_BOOTSTRAP 1){ + GOROOT_BOOTSTRAP = $home/$d + } for(p in $path){ - if(! test -x $GOROOT_BOOTSTRAP/bin/go){ + if(! test -x $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version){