diff options
Diffstat (limited to 'recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch')
| -rw-r--r-- | recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch index dc322612..26f5aad4 100644 --- a/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch +++ b/recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch @@ -3,25 +3,31 @@ From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Thu, 15 Apr 2021 11:28:05 -0400 Subject: [PATCH] cli: use external GO111MODULE and cross compiler +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- git/cli/scripts/build/binary | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -diff --git git/cli/scripts/build/binary git/cli/scripts/build/binary -index e4c5e12a6b..7c47b75c2f 100755 ---- git/cli/scripts/build/binary +Index: git/cli/scripts/build/binary +=================================================================== +--- git.orig/cli/scripts/build/binary +++ git/cli/scripts/build/binary -@@ -73,8 +73,7 @@ fi +@@ -13,8 +13,6 @@ echo "Building $GO_LINKMODE $(basename "${TARGET}")" -export GO111MODULE=auto +- + if [ "$(go env GOOS)" = "windows" ]; then + if [ ! -x "$(command -v goversioninfo)" ]; then + >&2 echo "goversioninfo not found, skipping manifesting binary" +@@ -24,6 +22,6 @@ + fi + fi --go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" -+${GO} build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" +-(set -x ; go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}") ++(set -x ; ${GO} build -trimpath -o "${TARGET}" -tags "${GO_BUILDTAGS}" -ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}") ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker" --- -2.19.1 - |