From 1c9bb64e35735598d9c735b34bc99793a6edef1d Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 25 Jan 2023 12:48:52 +0100 Subject: [PATCH] app-emulation/docker: update ppc64 buildmode patch for docker 20.10.23 Docker 20.10.23 has changes around hack/make/.binary, so it is necessary to adapt the ppc64 buildmode patch to make the build pass again. --- .../docker/files/ppc64-buildmode.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/ppc64-buildmode.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/ppc64-buildmode.patch index f16756e850..2d677a71ab 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/ppc64-buildmode.patch +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/ppc64-buildmode.patch @@ -17,14 +17,14 @@ index 5ea3e373f2..7a911de15a 100644 --- a/hack/make/.binary +++ b/hack/make/.binary @@ -70,7 +70,7 @@ hash_files() { + if [[ " $BUILDFLAGS " != *" -race "* ]]; then + # -buildmode=pie is not supported on Windows and Linux on mips and riscv64. + case "$(go env GOOS)/$(go env GOARCH)" in +- windows/* | linux/mips* | linux/riscv*) ;; ++ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;; - # -buildmode=pie is not supported on Windows and Linux on mips and riscv64. - case "$(go env GOOS)/$(go env GOARCH)" in -- windows/* | linux/mips* | linux/riscv*) ;; -+ windows/* | linux/mips* | linux/riscv* | linux/ppc64) ;; - - *) - BUILDFLAGS+=("-buildmode=pie") + *) + BUILDFLAGS+=("-buildmode=pie") -- 2.32.0