diff --git a/packages/g/go1.13/.files b/packages/g/go1.13/.files index 1da4bd2231d..70b6f807bd4 100644 Binary files a/packages/g/go1.13/.files and b/packages/g/go1.13/.files differ diff --git a/packages/g/go1.13/.rev b/packages/g/go1.13/.rev index a88940875b1..6f8b155762d 100644 --- a/packages/g/go1.13/.rev +++ b/packages/g/go1.13/.rev @@ -160,4 +160,12 @@ preparation for submit to SUSE. Remove %defattr(-,root,root,-) in %filesPrepare for RPM 4.20 (forwarded request 1152221 from dimstar) 1152293 + + 8837516c5cc4e7b61eab23edff091bc5 + 1.13.15 + + dimstar_suse + Add reproducible.patch to avoid build-time race (boo#1102408) (forwarded request 1168496 from bmwiedemann) + 1168528 + diff --git a/packages/g/go1.13/go1.13.changes b/packages/g/go1.13/go1.13.changes index 8f9513f7be8..f54e56d3096 100644 --- a/packages/g/go1.13/go1.13.changes +++ b/packages/g/go1.13/go1.13.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 15 18:00:45 UTC 2024 - Bernhard Wiedemann + +- Add reproducible.patch to avoid build-time race (boo#1102408) + ------------------------------------------------------------------- Tue Feb 27 11:31:09 UTC 2024 - Dominique Leuenberger diff --git a/packages/g/go1.13/go1.13.spec b/packages/g/go1.13/go1.13.spec index 0a9f3fbadde..087d9c96727 100644 --- a/packages/g/go1.13/go1.13.spec +++ b/packages/g/go1.13/go1.13.spec @@ -140,6 +140,7 @@ Patch9: gcc7-go.patch Patch11: gcc9-rsp-clobber.patch # PATCH-FIX-UPSTREAM prefer /etc/hosts over DNS when /etc/nsswitch.conf not present boo#1172868 gh#golang/go#35305 Patch12: go1.x-prefer-etc-hosts-over-dns.patch +Patch13: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # boostrap %if %{with gccgo} @@ -235,6 +236,7 @@ Go runtime race detector libraries. Install this package if you wish to use the %patch -P 9 -p1 %endif %endif +%patch -P 13 -p1 cp %{SOURCE4} . diff --git a/packages/g/go1.13/reproducible.patch b/packages/g/go1.13/reproducible.patch new file mode 100644 index 00000000000..57f7d354bed --- /dev/null +++ b/packages/g/go1.13/reproducible.patch @@ -0,0 +1,23 @@ +Date: 2024-04-15 +Author: Bernhard M. Wiedemann + +Workaround variations in build results between -j1 and -j4 builds. + +Compilation time on 4-core VM increases from 211 to 322 seconds, +while 1-core VM remains at 519 s. + +This patch applies to go1.15, go1.14 and go1.13 packages. + +Index: go/src/make.bash +=================================================================== +--- go.orig/src/make.bash ++++ go/src/make.bash +@@ -209,7 +209,7 @@ fi + # Run dist bootstrap to complete make.bash. + # Bootstrap installs a proper cmd/dist, built with the new toolchain. + # Throw ours, built with Go 1.4, away after bootstrap. +-./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" ++taskset 1 ./cmd/dist/dist bootstrap $buildall $vflag $GO_DISTFLAGS "$@" + rm -f ./cmd/dist/dist + + # DO NOT ADD ANY NEW CODE HERE.