Skip to content

Commit

Permalink
Update go1.13 to version 1.13.15 / rev 15 via SR 1168528
Browse files Browse the repository at this point in the history
https://build.opensuse.org/request/show/1168528
by user jfkw + dimstar_suse
Add reproducible.patch to avoid build-time race (boo#1102408) (forwarded request 1168496 from bmwiedemann)
  • Loading branch information
jfkw authored and bmwiedemann committed Apr 17, 2024
1 parent 4a8cf80 commit cc30586
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 0 deletions.
Binary file modified packages/g/go1.13/.files
Binary file not shown.
8 changes: 8 additions & 0 deletions packages/g/go1.13/.rev
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,12 @@ preparation for submit to SUSE. Remove %defattr(-,root,root,-) in %files</commen
<comment>Prepare for RPM 4.20 (forwarded request 1152221 from dimstar)</comment>
<requestid>1152293</requestid>
</revision>
<revision rev="15" vrev="4">
<srcmd5>8837516c5cc4e7b61eab23edff091bc5</srcmd5>
<version>1.13.15</version>
<time>1713357976</time>
<user>dimstar_suse</user>
<comment>Add reproducible.patch to avoid build-time race (boo#1102408) (forwarded request 1168496 from bmwiedemann)</comment>
<requestid>1168528</requestid>
</revision>
</revisionlist>
5 changes: 5 additions & 0 deletions packages/g/go1.13/go1.13.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 15 18:00:45 UTC 2024 - Bernhard Wiedemann <[email protected]>

- Add reproducible.patch to avoid build-time race (boo#1102408)

-------------------------------------------------------------------
Tue Feb 27 11:31:09 UTC 2024 - Dominique Leuenberger <[email protected]>

Expand Down
2 changes: 2 additions & 0 deletions packages/g/go1.13/go1.13.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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} .

Expand Down
23 changes: 23 additions & 0 deletions packages/g/go1.13/reproducible.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Date: 2024-04-15
Author: Bernhard M. Wiedemann <bmwiedemann suse de>

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.

0 comments on commit cc30586

Please sign in to comment.