syncthing: Fix GO_PKG_LDFLAGS_X position
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>
This commit is contained in:
parent
ab5bbd9b25
commit
e2fe9bda3d
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue