rpms/golang
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use released compiler-rt

Browse Source 
This commit elects to use a compatible released version of
compiler-rt, mostly to avoid having to upload the entire llvm
tarball for every scratch build.

Related: RHEL-33421
This commit is contained in:
David Benoit 2024-08-14 21:55:20 -04:00
parent 839d034ba4
commit f2e61b1119
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -81,3 +81,4 @@
/go1.22.5.tar.gz /go1.22.5.tar.gz
/go1.22.5-1-openssl-fips.tar.gz /go1.22.5-1-openssl-fips.tar.gz
/51bfeff0e4b0757ff773da6882f4d538996c9b04.tar.gz /51bfeff0e4b0757ff773da6882f4d538996c9b04.tar.gz
/compiler-rt-18.1.8.src.tar.xz

9
golang.spec
View File

@ -97,8 +97,8 @@
%global version %{go_version} %global version %{go_version}
%global pkg_release 1 %global pkg_release 1
# LLVM source SHA for race detector build # LLVM compiler-rt version for race detector
%global compiler_rt_go_race_sha 51bfeff0e4b0757ff773da6882f4d538996c9b04 %global llvm_compiler_rt_version 18.1.8
Name: golang Name: golang
Version: %{version} Version: %{version}
@ -117,7 +117,7 @@ Source0: https://github.com/golang/go/archive/refs/tags/go%{version}.tar.
Source1: https://github.com/golang-fips/go/archive/refs/tags/go%{version}-%{pkg_release}-openssl-fips.tar.gz Source1: https://github.com/golang-fips/go/archive/refs/tags/go%{version}-%{pkg_release}-openssl-fips.tar.gz
# make possible to override default traceback level at build time by setting build tag rpm_crashtraceback # make possible to override default traceback level at build time by setting build tag rpm_crashtraceback
Source2: fedora.go Source2: fedora.go
Source3: https://github.com/llvm/llvm-project/archive/%{compiler_rt_go_race_sha}.tar.gz Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{llvm_compiler_rt_version}/compiler-rt-%{llvm_compiler_rt_version}.src.tar.xz
# The compiler is written in Go. Needs go(1.4+) compiler for build. # The compiler is written in Go. Needs go(1.4+) compiler for build.
# Actual Go based bootstrap compiler provided by above source. # Actual Go based bootstrap compiler provided by above source.
@ -290,8 +290,9 @@ cat /proc/meminfo
# Build race detector .syso's from llvm sources # Build race detector .syso's from llvm sources
%global tsan_buildflags %(echo %{build_cflags} | sed 's/-mtls-dialect=gnu2//') %global tsan_buildflags %(echo %{build_cflags} | sed 's/-mtls-dialect=gnu2//')
mkdir ../llvm mkdir ../llvm
tar -xf %{SOURCE3} -C ../llvm tar -xf %{SOURCE3} -C ../llvm
tsan_go_dir="../llvm/llvm-project-%{compiler_rt_go_race_sha}/compiler-rt/lib/tsan/go" tsan_go_dir="../llvm/compiler-rt-%{llvm_compiler_rt_version}.src/lib/tsan/go"
# The script uses uname -a and grep to set the GOARCH. This # The script uses uname -a and grep to set the GOARCH. This
# is unreliable and can get the wrong architecture in # is unreliable and can get the wrong architecture in

4
sources
View File

@ -1,3 +1,3 @@
SHA512 (go1.22.5.tar.gz) = e0208d239ce4a4965d3c33fe5befbb1e919a0a695c9ef87c9dfc42d8b888c34301a6eb06a848a4eb662459bc06445d2a1f07275aa5d5e4b0cadb83e0bca0cab7 SHA512 (compiler-rt-18.1.8.src.tar.xz) = fb8795bd51c9b005c2ad1975591e9e2715740d6407ccad41379f136ef2e8d24ded8b97b01165a3ae4bd377119a6a1049ca05d3220404fc12bee86114ff2bff0d
SHA512 (go1.22.5-1-openssl-fips.tar.gz) = 230fa331c2470a7a42c916cd1bec79fa423e913d7722235b4386b0aaf678e9baefc71d5c201a6d2c63d5936d06f2756b945ba54513109b046d569daeecc1cef3 SHA512 (go1.22.5-1-openssl-fips.tar.gz) = 230fa331c2470a7a42c916cd1bec79fa423e913d7722235b4386b0aaf678e9baefc71d5c201a6d2c63d5936d06f2756b945ba54513109b046d569daeecc1cef3
SHA512 (51bfeff0e4b0757ff773da6882f4d538996c9b04.tar.gz) = 1c00ffa4ef0b73ea8551ce949ddbfb2991474003ce3b55f0c51fde71bab0011a47d1ef38a5ed702aca9461eac160ca900ec6438cca29f8ebad532c2d9ccadb1d SHA512 (go1.22.5.tar.gz) = e0208d239ce4a4965d3c33fe5befbb1e919a0a695c9ef87c9dfc42d8b888c34301a6eb06a848a4eb662459bc06445d2a1f07275aa5d5e4b0cadb83e0bca0cab7