From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F6AC1584AD for ; Tue, 06 May 2025 18:54:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 656DA340C39 for ; Tue, 06 May 2025 18:54:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 533F311036F; Tue, 06 May 2025 18:54:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4A80011036F for ; Tue, 06 May 2025 18:54:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEF46340C40 for ; Tue, 06 May 2025 18:54:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D5EC11F3 for ; Tue, 06 May 2025 18:54:24 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1746557659.1e0dff735248505eecb576a9c56f656a47ff56e6.mschiff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/syncthing/, net-p2p/syncthing/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch net-p2p/syncthing/syncthing-1.29.5.ebuild X-VCS-Directories: net-p2p/syncthing/files/ net-p2p/syncthing/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: 1e0dff735248505eecb576a9c56f656a47ff56e6 X-VCS-Branch: master Date: Tue, 06 May 2025 18:54:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7aac00cc-0a83-48ce-b4b4-cd73a7201d5f X-Archives-Hash: 9f58e846141f8b56665f284d8552cdd1 commit: 1e0dff735248505eecb576a9c56f656a47ff56e6 Author: Filip Kobierski pm me> AuthorDate: Mon May 5 11:50:03 2025 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Tue May 6 18:54:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0dff73 net-p2p/syncthing: port previously dropped patch Closes: https://bugs.gentoo.org/955442 Signed-off-by: Filip Kobierski pm.me> Part-of: https://github.com/gentoo/gentoo/pull/41941 Closes: https://github.com/gentoo/gentoo/pull/41941 Signed-off-by: Marc Schiffbauer gentoo.org> .../files/syncthing-1.29.5-remove_race_in_tests.patch | 15 +++++++++++++++ net-p2p/syncthing/syncthing-1.29.5.ebuild | 1 + 2 files changed, 16 insertions(+) diff --git a/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch new file mode 100644 index 000000000000..eb7b1faceb55 --- /dev/null +++ b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch @@ -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") diff --git a/net-p2p/syncthing/syncthing-1.29.5.ebuild b/net-p2p/syncthing/syncthing-1.29.5.ebuild index 9311a848e387..4648a8dafd6c 100644 --- a/net-p2p/syncthing/syncthing-1.29.5.ebuild +++ b/net-p2p/syncthing/syncthing-1.29.5.ebuild @@ -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() {