Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package go1.16 for openSUSE:Factory checked
in at 2022-08-22 11:04:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/go1.16 (Old)
and /work/SRC/openSUSE:Factory/.go1.16.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "go1.16"
Mon Aug 22 11:04:52 2022 rev:22 rq:998266 version:1.16.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/go1.16/go1.16.changes 2022-04-05
19:54:57.378566135 +0200
+++ /work/SRC/openSUSE:Factory/.go1.16.new.2083/go1.16.changes 2022-08-22
11:04:58.001679773 +0200
@@ -1,0 +2,8 @@
+Thu Aug 11 18:23:54 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- switch to gcc-go, bootstrap via gcc-go 11/12 which
+ should be available on leap, sle and factory
+- add gcc-go.patch to bootstrap with gcc-go any version
+- drop gcc6-go.patch, gcc7-go.patch: superseded by gcc-go.patch
+
+-------------------------------------------------------------------
Old:
----
gcc6-go.patch
gcc7-go.patch
New:
----
gcc-go.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ go1.16.spec ++++++
--- /var/tmp/diff_new_pack.CiTYRq/_old 2022-08-22 11:04:58.677681252 +0200
+++ /var/tmp/diff_new_pack.CiTYRq/_new 2022-08-22 11:04:58.685681269 +0200
@@ -25,30 +25,19 @@
%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 go_bootstrap_version go1.4
%else
-%ifarch riscv64
%define go_bootstrap_version go1.14
-%else
-%define go_bootstrap_version go1.9
%endif
-%if 0%{?sle_version} == 150000
-# SLE15 or Leap 15.x
-%define gcc_go_version 7
+%if 0%{?suse_version} > 1550
+%define gcc_go_version 12
%else
-%define gcc_go_version 9
+%define gcc_go_version 11
%endif
-%endif
-
-# By default use go and not gccgo
-%bcond_with gccgo
-# The fallback boostrap method via %%{go_bootstrap_version} would work for Leap
-# but we don't have %%{go_bootstrap_version} in there. Same for SLE15+
-#if ( 0%{?suse_version} < 1550 && 0%{?is_opensuse} ) || ( 0%{?suse_version} >=
1500 && ! 0%{?is_opensuse} )
-#bcond_without gccgo
-#endif
+# Bootstrap go toolchain using gccgo package gcc_go_version
+# To bootstrap using go use '--without gccgo'
+%bcond_without gccgo
# The fallback bootstrap method via go1.4 doesn't work
# for aarch64 nor ppc64le because go 1.4 did not support that architecture.
@@ -159,15 +148,11 @@
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}
-%ifnarch s390 s390x
-BuildRequires: binutils-gold
-%endif
BuildRequires: gcc%{gcc_go_version}-go
%else
# no gcc-go
@@ -234,13 +219,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
@@ -190,7 +190,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
@@ -162,8 +162,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
@@ -181,7 +181,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
@@ -52,7 +52,7 @@ GOROOT = `{cd .. && pwd}
if(! ~ $#GOROOT_BOOTSTRAP 1)
GOROOT_BOOTSTRAP = $home/go1.4
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){
@@ -61,7 +61,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
@@ -75,7 +75,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)
