Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GoQuiet: fix build with golang 1.16

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
AmadeusGhost 2021-03-02 12:08:04 +08:00 committed by Tianling Shen
parent 3968ea6107
commit 661efc3844
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
package/ctcgfw/GoQuiet/Makefile
View File

@ -11,65 +11,73 @@ PKG_VERSION:=1.2.2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git PKG_SOURCE_URL:=https://github.com/cbeuw/GoQuiet.git
PKG_MIRROR_HASH:=d16557d89ac909877128729590e34a3c7a9b430000525ed133e2fffb56a0310a
PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f PKG_SOURCE_VERSION:=013cdfdf72000dcd4691799c37a0cf960ab4c82f
PKG_MIRROR_HASH:=c9c97463e5286e8ad10de5e86512b98f60672235c47cfd9696188a16496fc56c
PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_LICENSE:=GPL-3.0
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_CONFIG_DEPENDS:= \
CONFIG_GQ_CLIENT_COMPRESS_UPX \
CONFIG_GQ_SERVER_COMPRESS_UPX
GO_PKG:=github.com/cbeuw/GoQuiet GO_PKG:=github.com/cbeuw/GoQuiet
GO_PKG_LDFLAGS:=-s -w GO_PKG_LDFLAGS:=-s -w
GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
define Package/gq-client define Package/GoQuiet/template
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=GoQuiet Client TITLE:=GoQuiet
DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
URL:=https://github.com/cbeuw/GoQuiet URL:=https://github.com/cbeuw/GoQuiet
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
endef endef
define Package/gq-client
$(call Package/GoQuiet/template)
TITLE+= Client
endef
define Package/gq-server define Package/gq-server
SECTION:=net $(call Package/GoQuiet/template)
CATEGORY:=Network TITLE+= Server
TITLE:=GoQuiet Server
DEPENDS:=$(GO_ARCH_DEPENDS) +libpthread
URL:=https://github.com/cbeuw/GoQuiet
SUBMENU:=Web Servers/Proxies
endef endef
define Package/gq-client/description define Package/gq-client/config
GoQuiet-Client config GQ_CLIENT_COMPRESS_UPX
bool "Compress executable files with UPX"
default y
endef endef
define Package/gq-server/description define Package/gq-server/config
GoQuiet-Server config GQ_SERVER_COMPRESS_UPX
bool "Compress executable files with UPX"
default y
endef endef
define Build/Prepare GO_PKG_BUILD_VARS += GO111MODULE=auto
tar -zxf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip-components 1
endef
define Build/Configure
endef
define Build/Compile define Build/Compile
$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-client) $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-client)
$(call GoPackage/Build/Configure) $(call GoPackage/Build/Configure)
$(call GoPackage/Build/Compile) $(call GoPackage/Build/Compile)
ifeq ($(CONFIG_GQ_CLIENT_COMPRESS_UPX),y)
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-client $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-client
endif
$(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-server) $(eval GO_PKG_BUILD_PKG:=$(GO_PKG)/cmd/gq-server)
$(call GoPackage/Build/Configure) $(call GoPackage/Build/Configure)
$(call GoPackage/Build/Compile) $(call GoPackage/Build/Compile)
ifeq ($(CONFIG_GQ_SERVER_COMPRESS_UPX),y)
$(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-server $(STAGING_DIR_HOST)/bin/upx --lzma --best $(GO_PKG_BUILD_BIN_DIR)/gq-server
endif
endef endef
define Package/gq-client/install define Package/gq-client/install