update to syncthing 0.12.23

while at it, make build system more verbose and add HOME MODGO_ENV, for tests.

OK edd@
This commit is contained in:
czarkoff 2016-05-11 09:35:26 +00:00
parent a7a67202e3
commit 3be378d41f
3 changed files with 27 additions and 7 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2016/05/09 10:00:49 czarkoff Exp $
# $OpenBSD: Makefile,v 1.5 2016/05/11 09:35:26 czarkoff Exp $
COMMENT = open decentralized synchronization utility
V = 0.12.22
REVISION = 0
V = 0.12.23
DISTNAME = syncthing-${V}
DISTFILES = syncthing-source-v${V}${EXTRACT_SUFX}
@ -19,13 +18,13 @@ WANTLIB += c pthread
MASTER_SITES = https://github.com/syncthing/syncthing/releases/download/v${V}/
WRKDIST = ${WRKDIR}/syncthing
WRKSRC = ${WRKDIR}/go/src/github.com/syncthing/syncthing
SUBST_VARS += VARBASE
MODULES = lang/go
MODGO_TYPE = bin
MODGO_SUBDIR = ${WRKDIR}/syncthing
MODGO_ENV = PATH="${PORTPATH}"
MODGO_ENV = PATH="${PORTPATH}" HOME="${PORTHOME}"
do-build:
cd ${WRKSRC} && ${MODGO_CMD} run build.go \

View File

@ -1,2 +1,2 @@
SHA256 (syncthing-source-v0.12.22.tar.gz) = pgsw/av5FxD0LVycLIIwhziyq20RIBTBs+IL/RLsjbg=
SIZE (syncthing-source-v0.12.22.tar.gz) = 4816944
SHA256 (syncthing-source-v0.12.23.tar.gz) = dc4mV6un+Fz9LqVVJy3D4hjZNjGFbVQXRUixGgAN+5E=
SIZE (syncthing-source-v0.12.23.tar.gz) = 5266067

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-build_go,v 1.1 2016/05/11 09:35:26 czarkoff Exp $
--- build.go.orig Wed May 11 00:53:47 2016
+++ build.go Wed May 11 00:55:06 2016
@@ -213,7 +213,7 @@ func install(pkg string, tags []string) {
log.Fatal(err)
}
os.Setenv("GOBIN", filepath.Join(cwd, "bin"))
- args := []string{"install", "-v", "-ldflags", ldflags()}
+ args := []string{"install", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, ","))
}
@@ -232,7 +232,7 @@ func build(pkg string, tags []string) {
}
rmr(binary)
- args := []string{"build", "-i", "-v", "-ldflags", ldflags()}
+ args := []string{"build", "-i", "-v", "-x", "-ldflags", ldflags()}
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, ","))
}