diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt index c7f85d0c27..52374080d1 100644 --- a/packages/addons/service/syncthing/changelog.txt +++ b/packages/addons/service/syncthing/changelog.txt @@ -1,5 +1,5 @@ 8.0.103 -- Update to version 0.13.10 +- Update to version 0.14.3 8.0.102 - Enable automatic upgrades diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index ecf62d633a..d0efb6065d 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="syncthing" -PKG_VERSION="0.13.10" +PKG_VERSION="0.14.3" PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="MPLv2" @@ -39,14 +39,11 @@ PKG_ADDON_PROVIDES="" PKG_AUTORECONF="no" configure_target() { - - export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go + go run build.go assets 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 + ln -fs $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/vendor/src case $TARGET_ARCH in x86_64) @@ -73,13 +70,14 @@ 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 GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/Godeps/_workspace + export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go + export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/vendor:$ROOT/$PKG_BUILD/Godeps/_workspace export GOROOT=$ROOT/$TOOLCHAIN/lib/golang export PATH=$PATH:$GOROOT/bin - export GO15VENDOREXPERIMENT=1 } make_target() { + cd $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing mkdir -p bin $GOLANG build -v -o bin/syncthing -a -ldflags "$LDFLAGS" ./cmd/syncthing }