From 5d78dbd8c77f372d45bc13016a2dbe96670b2b62 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Sep 2017 12:18:47 -0700 Subject: [PATCH] app-emulation/docker: Set GOARCH for this build system This fixes cross-compilation. --- .../docker/{docker-17.06.2.ebuild => docker-17.06.2-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 1 + .../coreos-overlay/app-torcx/docker/docker-17.06.ebuild | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.06.2.ebuild => docker-17.06.2-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 8752070fd1..96403cb78d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -215,6 +215,7 @@ src_unpack() { } src_compile() { + go_export export GOPATH="${WORKDIR}/${P}" # setup CFLAGS and LDFLAGS for separate build target diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.06.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.06.ebuild index 1139051518..e6e970a831 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.06.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.06.ebuild @@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-17.06.2 + =app-emulation/docker-17.06.2-r1 =app-emulation/containerd-0.2.9_p7 =app-emulation/docker-proxy-0.8.0_p20170410-r1 =app-emulation/docker-runc-1.0.0_rc3_p53