From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Date: Sat, 31 Mar 2018 15:27:36 +0200 Subject: [Buildroot] [PATCH v4 8/8] package/docker-proxy: convert to golang infrastructure In-Reply-To: <20180331132736.21105-1-thomas.petazzoni@bootlin.com> References: <20180331132736.21105-1-thomas.petazzoni@bootlin.com> Message-ID: <20180331132736.21105-9-thomas.petazzoni@bootlin.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Signed-off-by: Thomas Petazzoni --- package/docker-proxy/docker-proxy.mk | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index 3bf6546d26..46cbcc3b91 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -12,35 +12,12 @@ DOCKER_PROXY_LICENSE_FILES = LICENSE DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf -DOCKER_PROXY_GOPATH = "$(@D)/gopath" -DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - CGO_NO_EMULATION=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_PROXY_GOPATH)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - $(TARGET_MAKE_ENV) +DOCKER_PROXY_WORKSPACE = gopath -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_PROXY_GLDFLAGS += -extldflags '-static' -endif - -define DOCKER_PROXY_CONFIGURE_CMDS - mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker - ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork -endef - -define DOCKER_PROXY_BUILD_CMDS - cd $(@D)/gopath/src/github.com/docker/libnetwork; \ - $(DOCKER_PROXY_MAKE_ENV) \ - $(HOST_DIR)/usr/bin/go build -v \ - -o $(@D)/bin/docker-proxy \ - -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \ - github.com/docker/libnetwork/cmd/proxy -endef +DOCKER_PROXY_BUILD_TARGETS = cmd/proxy define DOCKER_PROXY_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy + $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_PROXY_BINDIR)/proxy $(TARGET_DIR)/usr/bin/docker-proxy endef -$(eval $(generic-package)) +$(eval $(golang-package)) -- 2.14.3