From 888a0c20a18210e06a65dbd4a032abf7cfe4652b214329f9248a652be0e3e854 Mon Sep 17 00:00:00 2001 From: Jeff Kowalczyk Date: Mon, 22 Aug 2022 23:38:27 +0000 Subject: [PATCH] Accepting request 998733 from home:jfkw:branches:devel:languages:go - Define go_bootstrap_version go1.16 without suse_version checks - Simplify conditional gcc_go_version 12 on Tumbleweed, 11 elsewhere - Add _constraints for worker disk space 5G needed by SLE-15 x86_64 - SLE-12 s390x use bcond_without gccgo to bootstrap using gcc11go * Workaround for SLE-12 s390x build error while writing linker data: bad carrier sym for symbol crypto/internal/nistec.p256OrdMul.args_stackmap created by cmd/link/internal/ld.writeBlocks /usr/lib64/go/1.19/src/cmd/link/internal/ld/data.go:958 OBS-URL: https://build.opensuse.org/request/show/998733 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/go1.19?expand=0&rev=8 --- _constraints | 7 +++++++ go1.19.changes | 17 +++++++++++++++-- go1.19.spec | 27 +++++++++++++-------------- 3 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 _constraints diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..4496146 --- /dev/null +++ b/_constraints @@ -0,0 +1,7 @@ + + + + 5 + + + diff --git a/go1.19.changes b/go1.19.changes index 41cc69e..00f2d1d 100644 --- a/go1.19.changes +++ b/go1.19.changes @@ -1,8 +1,21 @@ +------------------------------------------------------------------- +Mon Aug 22 20:44:19 UTC 2022 - Jeff Kowalczyk + +- Define go_bootstrap_version go1.16 without suse_version checks +- Simplify conditional gcc_go_version 12 on Tumbleweed, 11 elsewhere +- Add _constraints for worker disk space 5G needed by SLE-15 x86_64 +- SLE-12 s390x use bcond_without gccgo to bootstrap using gcc11go + * Workaround for SLE-12 s390x build error while writing linker data: + bad carrier sym for symbol crypto/internal/nistec.p256OrdMul.args_stackmap + created by cmd/link/internal/ld.writeBlocks + /usr/lib64/go/1.19/src/cmd/link/internal/ld/data.go:958 + ------------------------------------------------------------------- Fri Aug 19 17:53:40 UTC 2022 - Dirk Müller -- bootstrap factory via go1.16, so that older versions can be removed - from factory +- Bootstrap using go1.16 on SLE-15 and newer. go1.16 is + bootstrapped using gcc-go 11 or 12. This allows dropping older + versions of Go from Factory. ------------------------------------------------------------------- Tue Aug 9 05:56:23 UTC 2022 - Jeff Kowalczyk diff --git a/go1.19.spec b/go1.19.spec index 1ff0fba..3be5d98 100644 --- a/go1.19.spec +++ b/go1.19.spec @@ -24,26 +24,25 @@ %undefine _build_create_debug %define __arch_install_post export NO_BRP_STRIP_DEBUG=true NO_BRP_AR=true -%if 0%{?suse_version} == 1315 -%define gcc_go_version 8 -%define go_bootstrap_version go1.4 -%else +# Used to bootstrap go toolchain with specific existing package %define go_bootstrap_version go1.16 -%if 0%{?sle_version} == 150000 -# SLE15 or Leap 15.x -%define gcc_go_version 7 + +# Used to bootstrap go toolchain using specific version of gcc-go +%if 0%{?suse_version} > 1500 +# openSUSE Tumbleweed +%define gcc_go_version 12 %else -%define gcc_go_version 9 -%endif +%define gcc_go_version 11 %endif -# By default use go, use '--with gccgo' to bootstrap via gccgo -%bcond_with gccgo +# Bootstrap go toolchain using existing go package go_bootstrap_version +# To bootstrap using gccgo use '--with gccgo' +%bcond_with gccgo -# The fallback bootstrap method via go1.4 doesn't work -# for aarch64 nor ppc64le because go 1.4 did not support that architecture. +# Boostrapping using existing go package can fail on certain SLE-12 architectures +# Override here as needed %if 0%{?suse_version} == 1315 -%ifarch aarch64 ppc64le ppc64 s390x +%ifarch aarch64 ppc64le ppc64 %bcond_without gccgo %endif %endif