mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-22 06:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: Preserve existing CGO_*FLAGS

Browse Source 
This correctly defines the RPATH for arm64 binaries for torcx.
This commit is contained in:
David Michael 2017-09-13 12:30:23 -07:00
parent 7a059e13ba
commit c5833d983a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.06.2-r2.ebuild vendored
View File

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -220,8 +220,8 @@ src_compile() {
# setup CFLAGS and LDFLAGS for separate build target # setup CFLAGS and LDFLAGS for separate build target
# see https://github.com/tianon/docker-overlay/pull/10 # see https://github.com/tianon/docker-overlay/pull/10
export CGO_CFLAGS="-I${ROOT}/usr/include" export CGO_CFLAGS="${CGO_CFLAGS} -I${ROOT}/usr/include"
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" export CGO_LDFLAGS="${CGO_LDFLAGS} -L${ROOT}/usr/$(get_libdir)"
# if we're building from a tarball, we need the GITCOMMIT value # if we're building from a tarball, we need the GITCOMMIT value
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.06.ebuild vendored
View File

@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64"
# Explicitly list all packages that will be built into the image. # Explicitly list all packages that will be built into the image.
RDEPEND=" RDEPEND="
=app-emulation/docker-17.06.2-r1 =app-emulation/docker-17.06.2-r2
=app-emulation/containerd-0.2.9_p7 =app-emulation/containerd-0.2.9_p7
=app-emulation/docker-proxy-0.8.0_p20170410-r1 =app-emulation/docker-proxy-0.8.0_p20170410-r1
=app-emulation/docker-runc-1.0.0_rc3_p53 =app-emulation/docker-runc-1.0.0_rc3_p53