From eb5b34337560886d2d64d170985c99cd6e9cbbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Tue, 9 Apr 2024 10:31:27 +0200 Subject: [PATCH] Set the AMD64 baseline to v2 Resolves: RHEL-32657 --- golang.spec | 5 ++++- modify_go.env.patch | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/golang.spec b/golang.spec index 9090bdb..e010348 100644 --- a/golang.spec +++ b/golang.spec @@ -99,7 +99,7 @@ Name: golang Version: %{version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain License: BSD and Public Domain @@ -529,6 +529,9 @@ cd .. %files -n go-toolset %changelog +* Tue Apr 09 2024 Alejandro Sáez - 1.22.1-2 +- Set the AMD64 baseline to v2 + * Tue Mar 19 2024 Alejandro Sáez - 1.22.1-1 - Rebase to Go 1.22.1 - Re-enable CGO diff --git a/modify_go.env.patch b/modify_go.env.patch index 398f5c0..de7fa82 100644 --- a/modify_go.env.patch +++ b/modify_go.env.patch @@ -1,22 +1,27 @@ -From eab9004c072200e58df83ab94678bda1faa7b229 Mon Sep 17 00:00:00 2001 +From d6e201910aa29262851c9274a4cd3645022d3539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= -Date: Fri, 9 Feb 2024 20:06:16 +0100 -Subject: [PATCH] Set GOTOOLCHAIN to local +Date: Tue, 9 Apr 2024 10:05:46 +0200 +Subject: [PATCH] Modify environment variables defaults +- Set GOTOOLCHAIN to local +- Set GOAMD64 to v2 --- - go.env | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + go.env | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go.env b/go.env -index 6ff2b921d4..e87f6e7b6d 100644 +index 6ff2b921d4..aadcda023b 100644 --- a/go.env +++ b/go.env -@@ -9,4 +9,4 @@ GOSUMDB=sum.golang.org +@@ -9,4 +9,7 @@ GOSUMDB=sum.golang.org # Automatically download newer toolchains as directed by go.mod files. # See https://go.dev/doc/toolchain for details. -GOTOOLCHAIN=auto +GOTOOLCHAIN=local ++ ++# The AMD64 baseline for RHEL9 is v2. ++GOAMD64=v2 -- -2.43.0 +2.44.0