[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker-cli/

[Mike Gilbert]

commit:     f82be05190d6b6e6f572de194b1faed95f561aa6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 02:34:24 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=f82be051

app-emulation/docker-cli: 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-cli/docker-cli-20.10.2.ebuild    | 4 ++--
 app-emulation/docker-cli/docker-cli-20.10.3.ebuild    | 4 ++--
 app-emulation/docker-cli/docker-cli-20.10.4.ebuild    | 4 ++--
 app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild | 4 ++--
 app-emulation/docker-cli/docker-cli-20.10.5.ebuild    | 4 ++--
 app-emulation/docker-cli/metadata.xml                 | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-emulation/docker-cli/docker-cli-20.10.2.ebuild 
b/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
index f1767197a60..21b8e453793 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.2.ebuild
@@ -34,8 +34,8 @@ src_compile() {
        export GOPATH="${WORKDIR}/${P}"
        # 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)"
                emake \
                LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
                VERSION="$(cat VERSION)" \

diff --git a/app-emulation/docker-cli/docker-cli-20.10.3.ebuild 
b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
index 2675134a9e6..8d8ca051b48 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild
@@ -34,8 +34,8 @@ src_compile() {
        export GOPATH="${WORKDIR}/${P}"
        # 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)"
                emake \
                LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
                VERSION="$(cat VERSION)" \

diff --git a/app-emulation/docker-cli/docker-cli-20.10.4.ebuild 
b/app-emulation/docker-cli/docker-cli-20.10.4.ebuild
index b20c515611a..c65dda796af 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.4.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.4.ebuild
@@ -33,8 +33,8 @@ src_compile() {
        export GOPATH="${WORKDIR}/${P}"
        # 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)"
                emake \
                LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
                VERSION="$(cat VERSION)" \

diff --git a/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild 
b/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
index 7869c5f026b..063f8583dbe 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.5-r1.ebuild
@@ -33,8 +33,8 @@ src_compile() {
        export GOPATH="${WORKDIR}/${P}"
        # 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)"
                emake \
                LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
                VERSION="$(cat VERSION)" \

diff --git a/app-emulation/docker-cli/docker-cli-20.10.5.ebuild 
b/app-emulation/docker-cli/docker-cli-20.10.5.ebuild
index c23d7586e28..2d0065c9b02 100644
--- a/app-emulation/docker-cli/docker-cli-20.10.5.ebuild
+++ b/app-emulation/docker-cli/docker-cli-20.10.5.ebuild
@@ -33,8 +33,8 @@ src_compile() {
        export GOPATH="${WORKDIR}/${P}"
        # 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)"
                emake \
                LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
                VERSION="$(cat VERSION)" \

diff --git a/app-emulation/docker-cli/metadata.xml 
b/app-emulation/docker-cli/metadata.xml
index 3c49bd23955..c36c37139fa 100644
--- a/app-emulation/docker-cli/metadata.xml
+++ b/app-emulation/docker-cli/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
        <maintainer type="person">
                <email>willi...@gentoo.org</email>
-                       <name>William Hubbs</name>
-                               </maintainer>
-                                       </pkgmetadata>
+               <name>William Hubbs</name>
+       </maintainer>
+</pkgmetadata>