gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-05 14:07:27 -08:00
Code Issues Projects Releases Wiki Activity

net-p2p/syncthing: port previously dropped patch

Browse Source 
Closes: https://bugs.gentoo.org/955442
Signed-off-by: Filip Kobierski <fkobi@pm.me>
Part-of: https://github.com/gentoo/gentoo/pull/41941
Closes: https://github.com/gentoo/gentoo/pull/41941
Signed-off-by: Marc Schiffbauer <mschiff@gentoo.org>
This commit is contained in:
Filip Kobierski 2025-05-05 13:50:03 +02:00 committed by Marc Schiffbauer
parent 9bbd1d0cda
commit 1e0dff7352
No known key found for this signature in database
GPG Key ID: 3837C63B4632EDBF
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch Normal file
View File

@ -0,0 +1,15 @@
This patch removes conditional appending of "-race" flag.
It is needed as we build in PIE mode and race is incompatible with that.
https://bugs.gentoo.org/955442
--- a/build.go
+++ b/build.go
@@ -396,7 +396,7 @@
}
args = append(args, "-timeout", timeout)
- if runtime.GOARCH == "amd64" {
+ if false {
switch runtime.GOOS {
case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , "windows": # See https://github.com/golang/go/issues/27089
args = append(args, "-race")

1
net-p2p/syncthing/syncthing-1.29.5.ebuild
View File

@ -31,6 +31,7 @@ DOCS=( AUTHORS {GOALS,README}.md )
PATCHES=(
"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
"${FILESDIR}"/${PN}-1.29.5-remove_race_in_tests.patch #955442
)
src_prepare() {