commit: ca7b7f97a997ca003915690316712dcfe98f353f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 02:39:22 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 15:34:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7b7f97
app-emulation/docker: avoid using ROOT in src_compile
ESYSROOT should be used to locate headers and libraries.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-emulation/docker/docker-19.03.15.ebuild | 4 ++--
app-emulation/docker/docker-20.10.5.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-emulation/docker/docker-19.03.15.ebuild
b/app-emulation/docker/docker-19.03.15.ebuild
index 848e9be75a8..264b79cadde 100644
--- a/app-emulation/docker/docker-19.03.15.ebuild
+++ b/app-emulation/docker/docker-19.03.15.ebuild
@@ -194,8 +194,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="-I${ESYSROOT}/usr/include"
+ export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
# if we're building from a tarball, we need the GITCOMMIT value
[[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT
diff --git a/app-emulation/docker/docker-20.10.5.ebuild
b/app-emulation/docker/docker-20.10.5.ebuild
index 46bb5af09cd..0d576b0ffc8 100644
--- a/app-emulation/docker/docker-20.10.5.ebuild
+++ b/app-emulation/docker/docker-20.10.5.ebuild
@@ -165,8 +165,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="-I${ESYSROOT}/usr/include"
+ export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
# let's set up some optional features :)
export DOCKER_BUILDTAGS=''
