Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package go1.18 for openSUSE:Factory checked in at 2022-04-08 22:45:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/go1.18 (Old) and /work/SRC/openSUSE:Factory/.go1.18.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go1.18" Fri Apr 8 22:45:28 2022 rev:7 rq:967905 version:1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/go1.18/go1.18.changes 2022-04-04 19:26:52.840201401 +0200 +++ /work/SRC/openSUSE:Factory/.go1.18.new.1900/go1.18.changes 2022-04-08 22:45:31.699265962 +0200 @@ -1,0 +2,20 @@ +Thu Apr 7 23:57:47 UTC 2022 - Jeff Kowalczyk <jkowalc...@suse.com> + +- 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 + +------------------------------------------------------------------- +Thu Apr 7 17:51:56 UTC 2022 - Jeff Kowalczyk <jkowalc...@suse.com> + +- 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 + +------------------------------------------------------------------- Old: ---- gcc6-go.patch gcc7-go.patch New: ---- gcc-go.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ go1.18.spec ++++++ --- /var/tmp/diff_new_pack.lLKJsM/_old 2022-04-08 22:45:32.463257483 +0200 +++ /var/tmp/diff_new_pack.lLKJsM/_new 2022-04-08 22:45:32.467257438 +0200 @@ -25,7 +25,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true NO_BRP_AR=true %if 0%{?suse_version} == 1315 -%define gcc_go_version 6 +%define gcc_go_version 8 %define go_bootstrap_version go1.4 %else %ifarch riscv64 @@ -159,9 +159,8 @@ Source100: llvm-%{tsan_commit}.tar.xz # PATCH-FIX-OPENSUSE: https://go-review.googlesource.com/c/go/+/391115 Patch7: dont-force-gold-on-arm64.patch -# PATCH-FIX-UPSTREAM marguer...@opensuse.org - find /usr/bin/go-5 when bootstrapping with gcc5-go -Patch8: gcc6-go.patch -Patch9: gcc7-go.patch +# PATCH-FIX-UPSTREAM marguer...@opensuse.org - find /usr/bin/go-8 when bootstrapping with gcc8-go +Patch8: gcc-go.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # boostrap %if %{with gccgo} @@ -234,13 +233,13 @@ %setup -q -n go %patch7 -p1 %if %{with gccgo} -%if 0%{?gcc_go_version} == 6 +# Currently gcc-go does not manage an update-alternatives entry and will +# never be symlinked as "go", even if gcc-go is the only installed go toolchain. +# Patch go bootstrap scripts to find hardcoded go-(gcc-go-version) e.g. go-8 +# Substitute defined gcc_go_version into gcc-go.patch +sed -i "s/\$gcc_go_version/%{gcc_go_version}/" $RPM_SOURCE_DIR/gcc-go.patch %patch8 -p1 %endif -%if 0%{?gcc_go_version} == 7 -%patch9 -p1 -%endif -%endif cp %{SOURCE4} . ++++++ gcc-go.patch ++++++ Index: go/src/cmd/dist/buildtool.go =================================================================== --- go.orig/src/cmd/dist/buildtool.go +++ go/src/cmd/dist/buildtool.go @@ -205,7 +205,7 @@ func bootstrapBuildTools() { // only applies to the final cmd/go binary, but that's OK: if this is Go 1.10 // or later we don't need to disable inlining to work around bugs in the Go 1.4 compiler. cmd := []string{ - pathf("%s/bin/go", goroot_bootstrap), + pathf("%s/bin/go-$gcc_go_version", goroot_bootstrap), "install", "-gcflags=-l", "-tags=math_big_pure_go compiler_bootstrap", Index: go/src/make.bash =================================================================== --- go.orig/src/make.bash +++ go/src/make.bash @@ -60,7 +60,7 @@ # time goes when these scripts run. # # GOROOT_BOOTSTRAP: A working Go tree >= Go 1.4 for bootstrap. -# If $GOROOT_BOOTSTRAP/bin/go is missing, $(go env GOROOT) is +# If $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version is missing, $(go env GOROOT) is # tried for all "go" in $PATH. $HOME/go1.4 by default. set -e @@ -176,8 +176,8 @@ fi fi done; unset IFS -if [ ! -x "$GOROOT_BOOTSTRAP/bin/go" ]; then - echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go." >&2 +if [ ! -x "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" ]; then + echo "ERROR: Cannot find $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version." >&2 echo "Set \$GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4." >&2 exit 1 fi @@ -195,7 +195,7 @@ exit 1 fi rm -f cmd/dist/dist -GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go" build -o cmd/dist/dist ./cmd/dist +GOROOT="$GOROOT_BOOTSTRAP" GOOS="" GOARCH="" GO111MODULE=off "$GOROOT_BOOTSTRAP/bin/go-$gcc_go_version" build -o cmd/dist/dist ./cmd/dist # -e doesn't propagate out of eval, so check success by hand. eval $(./cmd/dist/dist env -p || echo FAIL=true) Index: go/src/make.rc =================================================================== --- go.orig/src/make.rc +++ go/src/make.rc @@ -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){ if(go_exe = `{path=$p whatis go}){ goroot = `{GOROOT='' $go_exe env GOROOT} if(! ~ $goroot $GOROOT){ @@ -73,7 +73,7 @@ for(p in $path){ } } } -if(! test -x $GOROOT_BOOTSTRAP/bin/go){ +if(! test -x $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version){ echo 'ERROR: Cannot find '$GOROOT_BOOTSTRAP'/bin/go.' >[1=2] echo 'Set $GOROOT_BOOTSTRAP to a working Go tree >= Go 1.4.' >[1=2] exit bootstrap @@ -87,7 +87,7 @@ if(~ $GOROOT_BOOTSTRAP $GOROOT){ echo 'Building Go cmd/dist using '^$GOROOT_BOOTSTRAP if(~ $#vflag 1) echo cmd/dist -GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' GO111MODULE=off $GOROOT_BOOTSTRAP/bin/go build -o cmd/dist/dist ./cmd/dist +GOROOT=$GOROOT_BOOTSTRAP GOOS='' GOARCH='' GO111MODULE=off $GOROOT_BOOTSTRAP/bin/go-$gcc_go_version build -o cmd/dist/dist ./cmd/dist eval `{./cmd/dist/dist env -9} if(~ $#vflag 1)