commit:     097f59065b071ff3f8bbc97e3ab4a35e233560ee
Author:     Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Sat Mar 23 09:44:20 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 02:34:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=097f5906

app-containers/buildah: fix calling as directly

Closes: https://bugs.gentoo.org/924038
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
From: https://github.com/gentoo/gentoo/pull/35931
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 app-containers/buildah/buildah-1.33.7.ebuild | 3 ++-
 app-containers/buildah/buildah-1.34.3.ebuild | 3 ++-
 app-containers/buildah/buildah-1.35.1.ebuild | 5 +++--
 app-containers/buildah/buildah-9999.ebuild   | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app-containers/buildah/buildah-1.33.7.ebuild 
b/app-containers/buildah/buildah-1.33.7.ebuild
index d2df0195c32a..f100d2a5a83a 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info
+inherit go-module linux-info toolchain-funcs
 
 DESCRIPTION="A tool that facilitates building OCI images"
 HOMEPAGE="https://github.com/containers/buildah";
@@ -109,6 +109,7 @@ src_compile() {
        # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
        [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
+       tc-export AS LD
        default
 }
 

diff --git a/app-containers/buildah/buildah-1.34.3.ebuild 
b/app-containers/buildah/buildah-1.34.3.ebuild
index d2df0195c32a..f100d2a5a83a 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info
+inherit go-module linux-info toolchain-funcs
 
 DESCRIPTION="A tool that facilitates building OCI images"
 HOMEPAGE="https://github.com/containers/buildah";
@@ -109,6 +109,7 @@ src_compile() {
        # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
        [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
+       tc-export AS LD
        default
 }
 

diff --git a/app-containers/buildah/buildah-1.35.1.ebuild 
b/app-containers/buildah/buildah-1.35.1.ebuild
index 8d0698568fd3..f5596936ec24 100644
--- a/app-containers/buildah/buildah-1.35.1.ebuild
+++ b/app-containers/buildah/buildah-1.35.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info
+inherit go-module linux-info toolchain-funcs
 
 DESCRIPTION="A tool that facilitates building OCI images"
 HOMEPAGE="https://github.com/containers/buildah";
@@ -35,7 +35,7 @@ RDEPEND="
        btrfs? ( sys-fs/btrfs-progs )
        seccomp? ( sys-libs/libseccomp:= )
        apparmor? ( sys-libs/libapparmor:= )
-       app-containers/containers-common
+       >=app-containers/containers-common-0.58.0-r1
        app-crypt/gpgme:=
        dev-libs/libgpg-error:=
        dev-libs/libassuan:=
@@ -109,6 +109,7 @@ src_compile() {
        # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
        [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
+       tc-export AS LD
        default
 }
 

diff --git a/app-containers/buildah/buildah-9999.ebuild 
b/app-containers/buildah/buildah-9999.ebuild
index e8ee0949a819..f5596936ec24 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit go-module linux-info
+inherit go-module linux-info toolchain-funcs
 
 DESCRIPTION="A tool that facilitates building OCI images"
 HOMEPAGE="https://github.com/containers/buildah";
@@ -109,6 +109,7 @@ src_compile() {
        # https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
        [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
+       tc-export AS LD
        default
 }
 

Reply via email to