syncthing: Fix GO_PKG_LDFLAGS_X position
authorPaul Spooren <mail@aparcar.org>
Sat, 27 Jun 2020 08:52:16 +0000 (22:52 -1000)
committerPaul Spooren <mail@aparcar.org>
Sat, 27 Jun 2020 20:30:29 +0000 (10:30 -1000)
Setting the GO_PKG_LDFLAGS_X after including golang-package does not
include them anymore after commit 25a7f00. By adding flags before they
are correctly loaded and included in `syncthing` binary.

Signed-off-by: Paul Spooren <mail@aparcar.org>
utils/syncthing/Makefile

index 4a0e781da3a7cdea2a945a5a718c6c7b72d7030a..c57730d2ef4197d5aadbe52fa67d3e967c96c7ba 100644 (file)
@@ -23,6 +23,13 @@ GO_PKG:=github.com/syncthing/syncthing/
 GO_PKG_BUILD_PKG:=github.com/syncthing/syncthing/cmd/syncthing/
 GO_PKG_INSTALL_EXTRA:=^gui/
 
+GO_PKG_LDFLAGS_X:=\
+       github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \
+       github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \
+       github.com/syncthing/syncthing/lib/build.User=openwrt \
+       github.com/syncthing/syncthing/lib/build.Host=openwrt \
+       github.com/syncthing/syncthing/lib/build.Program=syncthing
+
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
 
@@ -35,13 +42,6 @@ define Package/syncthing
   USERID:=syncthing:syncthing
 endef
 
-GO_PKG_LDFLAGS_X:=\
-       github.com/syncthing/syncthing/lib/build.Version=v$(PKG_VERSION) \
-       github.com/syncthing/syncthing/lib/build.Stamp=$(SOURCE_DATE_EPOCH) \
-       github.com/syncthing/syncthing/lib/build.User=openwrt \
-       github.com/syncthing/syncthing/lib/build.Host=openwrt \
-       github.com/syncthing/syncthing/lib/build.Program=syncthing
-
 define Build/Compile
   $(call GoPackage/Build/Compile,-tags noupgrade)
 endef