From 081808ce69e1fb02a0fa72b215dd535cc902de1c Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sat, 9 Feb 2019 19:42:06 +0800 Subject: [PATCH 1/4] golang: Fix handling of filenames with spaces Closes #7127. Signed-off-by: Jeffery To --- lang/golang/golang-package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 1df4c3fec..4551d7b70 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -164,6 +164,8 @@ define GoPackage/Build/Configure files=$$$$(echo "$$$$files" | grep -v '^[[:space:]]*$$$$' | sort -u) ; \ fi ; \ \ + IFS=$$$$'\n' ; \ + \ echo "Copying files from $(PKG_BUILD_DIR) into $(GO_PKG_BUILD_DIR)/src/$(GO_PKG)" ; \ for file in $$$$files; do \ echo $$$$file ; \ From a80d54fc49ac8bbe0814c1c51b23505402d7e91d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sat, 9 Feb 2019 19:52:49 +0800 Subject: [PATCH 2/4] golang: Install files with .cpp/.hpp suffixes by default This also updates the URL for dh-golang. Signed-off-by: Jeffery To --- lang/golang/golang-package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 4551d7b70..3c1137b94 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -28,7 +28,7 @@ include $(GO_INCLUDE_DIR)/golang-values.mk # files are installed: # # * Files with one of these extensions: -# .go, .c, .cc, .h, .hh, .proto, .s +# .go, .c, .cc, .cpp, .h, .hh, .hpp, .proto, .s # # * Files in any 'testdata' directory # @@ -77,7 +77,7 @@ include $(GO_INCLUDE_DIR)/golang-values.mk # Credit for this package build process (GoPackage/Build/Configure and # GoPackage/Build/Compile) belong to Debian's dh-golang completely. -# https://anonscm.debian.org/cgit/pkg-go/packages/dh-golang.git +# https://salsa.debian.org/go-team/packages/dh-golang # for building packages, not user code @@ -153,7 +153,7 @@ define GoPackage/Build/Configure sed 's|^\./||') ; \ \ if [ "$(GO_PKG_INSTALL_ALL)" != 1 ]; then \ - code=$$$$(echo "$$$$files" | grep '\.\(c\|cc\|go\|h\|hh\|proto\|s\)$$$$') ; \ + code=$$$$(echo "$$$$files" | grep '\.\(c\|cc\|cpp\|go\|h\|hh\|hpp\|proto\|s\)$$$$') ; \ testdata=$$$$(echo "$$$$files" | grep '\(^\|/\)testdata/') ; \ \ for pattern in $(GO_PKG_INSTALL_EXTRA); do \ From 7dc1f3e0293588ebc544e8eee104043dd0dacaf5 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sat, 9 Feb 2019 20:00:56 +0800 Subject: [PATCH 3/4] golang: Install go.mod/go.sum by default Signed-off-by: Jeffery To --- lang/golang/golang-package.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/golang/golang-package.mk b/lang/golang/golang-package.mk index 3c1137b94..887d54dad 100644 --- a/lang/golang/golang-package.mk +++ b/lang/golang/golang-package.mk @@ -32,6 +32,8 @@ include $(GO_INCLUDE_DIR)/golang-values.mk # # * Files in any 'testdata' directory # +# * go.mod and go.sum, in any directory +# # e.g. GO_PKG_INSTALL_EXTRA:=example.toml marshal_test.toml # # @@ -155,12 +157,13 @@ define GoPackage/Build/Configure if [ "$(GO_PKG_INSTALL_ALL)" != 1 ]; then \ code=$$$$(echo "$$$$files" | grep '\.\(c\|cc\|cpp\|go\|h\|hh\|hpp\|proto\|s\)$$$$') ; \ testdata=$$$$(echo "$$$$files" | grep '\(^\|/\)testdata/') ; \ + gomod=$$$$(echo "$$$$files" | grep '\(^\|/\)go\.\(mod\|sum\)$$$$') ; \ \ for pattern in $(GO_PKG_INSTALL_EXTRA); do \ extra=$$$$(echo "$$$$extra"; echo "$$$$files" | grep "$$$$pattern") ; \ done ; \ \ - files=$$$$(echo "$$$$code"; echo "$$$$testdata"; echo "$$$$extra") ; \ + files=$$$$(echo "$$$$code"; echo "$$$$testdata"; echo "$$$$gomod"; echo "$$$$extra") ; \ files=$$$$(echo "$$$$files" | grep -v '^[[:space:]]*$$$$' | sort -u) ; \ fi ; \ \ From 6a8c72c7b007640c7f028aedc7394ebe6739f155 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 11 Feb 2019 16:00:56 +0800 Subject: [PATCH 4/4] golang: Ignore GOFLAGS, GO111MODULE environment variables These were added in Go 1.11. Signed-off-by: Jeffery To --- lang/golang/golang-values.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/golang/golang-values.mk b/lang/golang/golang-values.mk index 893f9296d..caae21efb 100644 --- a/lang/golang/golang-values.mk +++ b/lang/golang/golang-values.mk @@ -13,7 +13,7 @@ include $(GO_INCLUDE_DIR)/golang-version.mk unexport \ - GOARCH GOBIN GOCACHE GODEBUG GOHOSTARCH GOOS GOPATH GORACE GOROOT GOTMPDIR GCCGO \ + GOARCH GOBIN GOCACHE GODEBUG GOFLAGS GOHOSTARCH GOOS GOPATH GORACE GOROOT GOTMPDIR GCCGO \ CGO_ENABLED \ CGO_CFLAGS CGO_CFLAGS_ALLOW CGO_CFLAGS_DISALLOW \ CGO_CPPFLAGS CGO_CPPFLAGS_ALLOW CGO_CPPFLAGS_DISALLOW \ @@ -21,6 +21,7 @@ unexport \ CGO_FFLAGS CGO_FFLAGS_ALLOW CGO_FFLAGS_DISALLOW \ CGO_LDFLAGS CGO_LDFLAGS_ALLOW CGO_LDFLAGS_DISALLOW \ GOARM GO386 GOMIPS GOMIPS64 \ + GO111MODULE \ GOROOT_FINAL GO_EXTLINK_ENABLED GIT_ALLOW_PROTOCOL \ CC_FOR_TARGET CXX_FOR_TARGET GO_DISTFLAGS GO_GCFLAGS GO_LDFLAGS GOBUILDTIMELOGFILE GOROOT_BOOTSTRAP \ BOOT_GO_GCFLAGS GOEXPERIMENT GOBOOTSTRAP_TOOLEXEC