From 439e4742dc574c1f7951953a16162c606f4770a3 Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Sat, 23 Mar 2024 15:14:20 +0530 Subject: [PATCH 1/2] app-containers/buildah: fix calling as directly Closes: https://bugs.gentoo.org/924038 Signed-off-by: Rahil Bhimjiani --- 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 8d0698568fd3a..cd9f0c56fd417 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 8d0698568fd3a..cd9f0c56fd417 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 8d0698568fd3a..f5596936ec244 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 e8ee0949a819d..f5596936ec244 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 } From 8c5f62733222fa48f28d7d7937ceab5524d619db Mon Sep 17 00:00:00 2001 From: Rahil Bhimjiani Date: Wed, 27 Mar 2024 01:38:19 +0530 Subject: [PATCH 2/2] app-containers/buildah: add go-md2man as BDEPEND and ... remove unnecessary build steps which were running tests resulting in failed build on arm64 (and potentially other archs). Closes: https://bugs.gentoo.org/888571 Signed-off-by: Rahil Bhimjiani --- app-containers/buildah/buildah-1.33.7.ebuild | 5 +++++ app-containers/buildah/buildah-1.34.3.ebuild | 5 +++++ app-containers/buildah/buildah-1.35.1.ebuild | 5 +++++ app-containers/buildah/buildah-9999.ebuild | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/app-containers/buildah/buildah-1.33.7.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild index cd9f0c56fd417..43b57f2cbc5c1 100644 --- a/app-containers/buildah/buildah-1.33.7.ebuild +++ b/app-containers/buildah/buildah-1.33.7.ebuild @@ -42,6 +42,7 @@ RDEPEND=" sys-apps/shadow:= " DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" pkg_pretend() { local CONFIG_CHECK="" @@ -98,6 +99,9 @@ src_prepare() { @@ -54 +54 @@ -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs +all: bin/buildah docs + @@ -123 +123 @@ + -docs: install.tools ## build the docs on the host + +docs: ## build the docs on the host EOF eapply "${T}/disable_tests.patch" || die } @@ -110,6 +114,7 @@ src_compile() { [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" tc-export AS LD + export GOMD2MAN="$(command -v go-md2man)" default } diff --git a/app-containers/buildah/buildah-1.34.3.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild index cd9f0c56fd417..43b57f2cbc5c1 100644 --- a/app-containers/buildah/buildah-1.34.3.ebuild +++ b/app-containers/buildah/buildah-1.34.3.ebuild @@ -42,6 +42,7 @@ RDEPEND=" sys-apps/shadow:= " DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" pkg_pretend() { local CONFIG_CHECK="" @@ -98,6 +99,9 @@ src_prepare() { @@ -54 +54 @@ -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs +all: bin/buildah docs + @@ -123 +123 @@ + -docs: install.tools ## build the docs on the host + +docs: ## build the docs on the host EOF eapply "${T}/disable_tests.patch" || die } @@ -110,6 +114,7 @@ src_compile() { [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" tc-export AS LD + export GOMD2MAN="$(command -v go-md2man)" default } diff --git a/app-containers/buildah/buildah-1.35.1.ebuild b/app-containers/buildah/buildah-1.35.1.ebuild index f5596936ec244..ecf84e28950cb 100644 --- a/app-containers/buildah/buildah-1.35.1.ebuild +++ b/app-containers/buildah/buildah-1.35.1.ebuild @@ -42,6 +42,7 @@ RDEPEND=" sys-apps/shadow:= " DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" pkg_pretend() { local CONFIG_CHECK="" @@ -98,6 +99,9 @@ src_prepare() { @@ -54 +54 @@ -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs +all: bin/buildah docs + @@ -123 +123 @@ + -docs: install.tools ## build the docs on the host + +docs: ## build the docs on the host EOF eapply "${T}/disable_tests.patch" || die } @@ -110,6 +114,7 @@ src_compile() { [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" tc-export AS LD + export GOMD2MAN="$(command -v go-md2man)" default } diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild index f5596936ec244..ecf84e28950cb 100644 --- a/app-containers/buildah/buildah-9999.ebuild +++ b/app-containers/buildah/buildah-9999.ebuild @@ -42,6 +42,7 @@ RDEPEND=" sys-apps/shadow:= " DEPEND="${RDEPEND}" +BDEPEND="dev-go/go-md2man" pkg_pretend() { local CONFIG_CHECK="" @@ -98,6 +99,9 @@ src_prepare() { @@ -54 +54 @@ -all: bin/buildah bin/imgtype bin/copy bin/tutorial docs +all: bin/buildah docs + @@ -123 +123 @@ + -docs: install.tools ## build the docs on the host + +docs: ## build the docs on the host EOF eapply "${T}/disable_tests.patch" || die } @@ -110,6 +114,7 @@ src_compile() { [[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" tc-export AS LD + export GOMD2MAN="$(command -v go-md2man)" default }