From 746b09742588e4cb1f333e098429b644d0222279 Mon Sep 17 00:00:00 2001 From: Archana Date: Wed, 25 Oct 2023 22:02:21 +0530 Subject: [PATCH] - Rebase disable_static_tests_part2.patch to Go 1.21.3 - Related: RHEL-12624 --- disable_static_tests_part2.patch | 6 +++--- golang.spec | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/disable_static_tests_part2.patch b/disable_static_tests_part2.patch index aa2d91c..494de22 100644 --- a/disable_static_tests_part2.patch +++ b/disable_static_tests_part2.patch @@ -1,13 +1,13 @@ diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index 9f26606..2408505 100644 +index 36a20e8b2a..8c2dd1b44b 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go -@@ -1259,7 +1259,7 @@ func (t *tester) registerCgoTests() { +@@ -1125,7 +1125,7 @@ func (t *tester) registerCgoTests(heading string) { } else { panic("unknown linkmode with static build: " + linkmode) } - gt.tags = append(gt.tags, "static") + gt.tags = append(gt.tags, "static", "no_openssl") } + gt.ldflags = strings.Join(ldflags, " ") - t.registerTest("cgo:"+name, "../misc/cgo/test", gt, opts...) diff --git a/golang.spec b/golang.spec index a0fd03e..f5ec349 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 @@ -525,6 +525,10 @@ cd .. %files -n go-toolset %changelog +* Wed Oct 25 2023 Archana Ravindar - 1.21.3-2 +- Rebase disable_static_tests_part2.patch to Go 1.21.3 +- Related: RHEL-12624 + * Fri Oct 20 2023 Archana Ravindar - 1.21.3-1 - Rebase to Go 1.21.3 - Resolves: RHEL-12624