From 96493bbfc5b792654490d62db10fae78bc2bccda Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Jul 2020 09:19:18 -0400 Subject: [PATCH] import golang-1.14.4-1.module+el8.3.0+7194+8f728120 --- .gitignore | 2 +- .golang.metadata | 2 +- SPECS/golang.spec | 32 ++++++++++++++++++-------------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 0144cb8..c4616f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz +SOURCES/go-go-1.14.4-1-openssl-fips.tar.gz diff --git a/.golang.metadata b/.golang.metadata index c6b3f80..4cbcc3d 100644 --- a/.golang.metadata +++ b/.golang.metadata @@ -1 +1 @@ -c9f2a53028d012c6db32a34a9345e08aba31a771 SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz +c68072d707cf093fba93bc2d7cda172cd3749120 SOURCES/go-go-1.14.4-1-openssl-fips.tar.gz diff --git a/SPECS/golang.spec b/SPECS/golang.spec index 6ff71c6..e927429 100644 --- a/SPECS/golang.spec +++ b/SPECS/golang.spec @@ -29,20 +29,20 @@ # Define GOROOT macros %global goroot %{_prefix}/lib/%{name} %global gopath %{_datadir}/gocode -%global golang_arches %{ix86} x86_64 aarch64 ppc64le s390x +%global golang_arches x86_64 aarch64 ppc64le s390x %global golibdir %{_libdir}/%{name} # Golang build options. # Build golang using external/internal(close to cgo disabled) linking. -%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global external_linker 1 %else %global external_linker 0 %endif # Build golang with cgo enabled/disabled(later equals more or less to internal linking). -%ifarch %{ix86} x86_64 ppc64le %{arm} aarch64 s390x +%ifarch x86_64 ppc64le %{arm} aarch64 s390x %global cgo_enabled 1 %else %global cgo_enabled 0 @@ -56,7 +56,7 @@ %endif # Controls what ever we fail on failed tests -%ifarch %{ix86} x86_64 %{arm} aarch64 ppc64le +%ifarch x86_64 %{arm} aarch64 ppc64le %global fail_on_tests 1 %else %global fail_on_tests 0 @@ -79,9 +79,6 @@ %ifarch x86_64 %global gohostarch amd64 %endif -%ifarch %{ix86} -%global gohostarch 386 -%endif %ifarch %{arm} %global gohostarch arm %endif @@ -98,13 +95,13 @@ %global gohostarch s390x %endif -%global go_api 1.13 -%global go_version 1.13.4 +%global go_api 1.14 +%global go_version 1.14.4 %global pkg_release 1 Name: golang Version: %{go_version} -Release: 2%{?dist} +Release: 1%{?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 @@ -426,10 +423,6 @@ export GO_TEST_RUN="" %if %{fail_on_tests} -# Limit number of test threads on i686 to avoid OOM failures. -%ifarch %{ix86} -export GOMAXPROCS=8 -%endif ./run.bash --no-rebuild -v -v -v -k $GO_TEST_RUN # Run tests with FIPS enabled. @@ -505,6 +498,17 @@ cd .. %endif %changelog +* Thu Jun 25 2020 Alejandro Sáez - 1.14.4-1 +- Rebase to 1.14.4 + +* Thu May 21 2020 Alejandro Sáez - 1.14.2-2 +- Remove i686 references +- Related: rhbz#1752991 + +* Wed May 06 2020 Alejandro Sáez - 1.14.2-1 +- Rebase to 1.14.2 +- Related: rhbz#1820596 + * Wed Nov 27 2019 Alejandro Sáez - 1.13.4-2 - Remove patches - Related: rhbz#1747150