Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13d32afa06f1fdcdd70f1162070b299f78874e49
commit 13d32afa06f1fdcdd70f1162070b299f78874e49 Author: DeX77 <[email protected]> Date: Thu Jul 27 13:47:58 2017 +0200 syncthing-0.14.33-1-x86_64 * version bump diff --git a/source/network-extra/syncthing/FrugalBuild b/source/network-extra/syncthing/FrugalBuild index b647678..f684214 100644 --- a/source/network-extra/syncthing/FrugalBuild +++ b/source/network-extra/syncthing/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: DeX77 <[email protected]> pkgname=syncthing -pkgver=0.14.32 +pkgver=0.14.33 pkgrel=1 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing" url="http://syncthing.net/"; @@ -17,10 +17,13 @@ _F_github_tag_v="y" _F_systemd_units="syncthing=" _F_archive_grepv="beta\|-rc" Finclude github systemd -sha1sums=('b97f08e4515486f0489decc06cfb5f0ed3a07713') +source+=("fix-build.patch") +sha1sums=('d748faeeda4db6127777f691a617770d12bfbaa3' \ + '9a529b8e6ebb1fb50596748eb22c2e484e340531') _F_cd_path="src/github.com/syncthing/syncthing" build() { + Fpatchall Fexec rm -rf src/github.com/syncthing/ Fexec mkdir -p src/github.com/syncthing/ diff --git a/source/network-extra/syncthing/fix-build.patch b/source/network-extra/syncthing/fix-build.patch new file mode 100644 index 0000000..54b4952 --- /dev/null +++ b/source/network-extra/syncthing/fix-build.patch @@ -0,0 +1,52 @@ +From 414c58174b76adf22c783d04ace5e5caa326de2e Mon Sep 17 00:00:00 2001 +From: Jakob Borg <[email protected]> +Date: Thu, 27 Jul 2017 12:55:07 +0200 +Subject: [PATCH] build: Move -installsuffix behind an explicit option (fixes + #4272) + +--- + build.go | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/build.go b/build.go +index f2d32d890..d8e7f0057 100644 +--- a/build.go ++++ b/build.go +@@ -44,6 +44,7 @@ var ( + debug = os.Getenv("BUILDDEBUG") != "" + noBuildGopath bool + extraTags string ++ installSuffix string + ) + + type target struct { +@@ -340,6 +341,7 @@ func parseFlags() { + flag.BoolVar(&race, "race", race, "Use race detector") + flag.BoolVar(&noBuildGopath, "no-build-gopath", noBuildGopath, "Don't build GOPATH, assume it's OK") + flag.StringVar(&extraTags, "tags", extraTags, "Extra tags, space separated") ++ flag.StringVar(&installSuffix, "installsuffix", installSuffix, "Install suffix, optional") + flag.Parse() + } + +@@ -404,7 +406,9 @@ func install(target target, tags []string) { + args := []string{"install", "-v", "-ldflags", ldflags()} + if len(tags) > 0 { + args = append(args, "-tags", strings.Join(tags, " ")) +- args = append(args, "-installsuffix", strings.Join(tags, "-")) ++ } ++ if installSuffix != "" { ++ args = append(args, "-installsuffix", installSuffix) + } + if race { + args = append(args, "-race") +@@ -425,7 +429,9 @@ func build(target target, tags []string) { + args := []string{"build", "-i", "-v", "-ldflags", ldflags()} + if len(tags) > 0 { + args = append(args, "-tags", strings.Join(tags, " ")) +- args = append(args, "-installsuffix", strings.Join(tags, "-")) ++ } ++ if installSuffix != "" { ++ args = append(args, "-installsuffix", installSuffix) + } + if race { + args = append(args, "-race") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
