From 7c0d78d8b6758c8ac4fa17ab043c91dbda45b4ba Mon Sep 17 00:00:00 2001 From: jc Date: Fri, 15 Jul 2016 16:57:49 +0200 Subject: [PATCH] syncthing: update --- .../addons/service/syncthing/changelog.txt | 3 +++ packages/addons/service/syncthing/package.mk | 20 +++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt index edb8383d02..c7f85d0c27 100644 --- a/packages/addons/service/syncthing/changelog.txt +++ b/packages/addons/service/syncthing/changelog.txt @@ -1,3 +1,6 @@ +8.0.103 +- Update to version 0.13.10 + 8.0.102 - Enable automatic upgrades diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index 3e6ba93b0e..ecf62d633a 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="syncthing" -PKG_VERSION="0.12.24" -PKG_REV="102" +PKG_VERSION="0.13.10" +PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="MPLv2" PKG_SITE="https://syncthing.net/" @@ -40,6 +40,14 @@ PKG_AUTORECONF="no" configure_target() { + export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go + + mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing + ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing + cd $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing + + go run build.go assets + case $TARGET_ARCH in x86_64) export GOARCH=amd64 @@ -65,14 +73,10 @@ configure_target() { export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $TARGET_CC -X main.Version=v$PKG_VERSION" - export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go - export GOPATH=$ROOT/$PKG_BUILD:$ROOT/$PKG_BUILD/Godeps/_workspace + export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/Godeps/_workspace export GOROOT=$ROOT/$TOOLCHAIN/lib/golang export PATH=$PATH:$GOROOT/bin - - mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing - ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing - + export GO15VENDOREXPERIMENT=1 } make_target() {