net-p2p/syncthing: support cross compilation (take 2)

now with support for USE=tools

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexandra Parker <alex.iris.parker@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23778
Signed-off-by: Marek Szuba <marecki@gentoo.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
new file mode 100644
index 000000000000..20dc63dca2f5
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.18.6-build-out.patch
@@ -0,0 +1,30 @@
+diff --git a/build.go b/build.go
+index c2e1059398..7888c834d2 100644
+--- a/build.go
++++ b/build.go
+@@ -47,6 +47,7 @@ var (
+ 	cc             string
+ 	run            string
+ 	benchRun       string
++	buildOut       string
+ 	debugBinary    bool
+ 	coverage       bool
+ 	long           bool
+@@ -374,6 +375,7 @@ func parseFlags() {
+ 	flag.StringVar(&run, "run", "", "Specify which tests to run")
+ 	flag.StringVar(&benchRun, "bench", "", "Specify which benchmarks to run")
+ 	flag.BoolVar(&withNextGenGUI, "with-next-gen-gui", withNextGenGUI, "Also build 'newgui'")
++	flag.StringVar(&buildOut, "build-out", "", "Set the '-o' value for 'go build'")
+ 	flag.Parse()
+ }
+ 
+@@ -506,6 +508,9 @@ func build(target target, tags []string) {
+ 	}
+ 
+ 	args := []string{"build", "-v"}
++	if buildOut != "" {
++		args = append(args, "-o", buildOut)
++	}
+ 	args = appendParameters(args, tags, target.buildPkgs...)
+ 	runPrint(goCmd, args...)
+ }