From c5833d983af24599e35988d69423f502f2ecfcb6 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 13 Sep 2017 12:30:23 -0700 Subject: [PATCH] app-emulation/docker: Preserve existing CGO_*FLAGS This correctly defines the RPATH for arm64 binaries for torcx. --- .../{docker-17.06.2-r1.ebuild => docker-17.06.2-r2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 4 ++-- .../coreos-overlay/app-torcx/docker/docker-17.06.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.06.2-r1.ebuild => docker-17.06.2-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r2.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 96403cb78d..1e6c7b4f8e 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 @@ -220,8 +220,8 @@ src_compile() { # setup CFLAGS and LDFLAGS for separate build target # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ROOT}/usr/include" - export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + export CGO_CFLAGS="${CGO_CFLAGS} -I${ROOT}/usr/include" + export CGO_LDFLAGS="${CGO_LDFLAGS} -L${ROOT}/usr/$(get_libdir)" # if we're building from a tarball, we need the GITCOMMIT value [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT 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 e6e970a831..14131fa562 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-r1 + =app-emulation/docker-17.06.2-r2 =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