diff options
| author | TBK <tbk@jjtc.eu> | 2019-04-01 19:10:54 +0200 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-04-01 18:43:16 +0000 |
| commit | 429ca4015713adae476278e5cb117d9ff3afe53b (patch) | |
| tree | 88cf89a528604e29be262aa4ea6a8e22e45e4be8 /testing/kubernetes/ensure-cgo-usage.patch | |
| parent | fb0b2db4e4b5a93fc5f5b18fa1ad211a9783f63b (diff) | |
| download | aports-429ca4015713adae476278e5cb117d9ff3afe53b.tar.bz2 aports-429ca4015713adae476278e5cb117d9ff3afe53b.tar.xz | |
testing/kubernetes: upgrade to 1.14.0
Diffstat (limited to 'testing/kubernetes/ensure-cgo-usage.patch')
| -rw-r--r-- | testing/kubernetes/ensure-cgo-usage.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/testing/kubernetes/ensure-cgo-usage.patch b/testing/kubernetes/ensure-cgo-usage.patch index 2dc19dabaf..a93ea161b0 100644 --- a/testing/kubernetes/ensure-cgo-usage.patch +++ b/testing/kubernetes/ensure-cgo-usage.patch @@ -19,15 +19,10 @@ are not enough to ensure its usage in Alpine. This leads to errors like: collect2: error: ld returned 1 exit status --- - hack/lib/golang.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh -index 9eb52a7d..53282e74 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh -@@ -588,7 +588,7 @@ kube::golang::build_binaries_for_platform() { - -gcflags "${gogcflags:-}" +@@ -611,7 +611,7 @@ + -asmflags "${goasmflags:-}" -ldflags "${goldflags:-}" ) - CGO_ENABLED=0 kube::golang::build_some_binaries "${statics[@]}" @@ -35,5 +30,3 @@ index 9eb52a7d..53282e74 100755 fi if [[ "${#nonstatics[@]}" != 0 ]]; then --- -2.18.1 |