diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2019-06-17 11:42:57 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-26 07:04:39 +0100 |
| commit | fdb7c261ad5228907b77b7ad0d0328b2c2635deb (patch) | |
| tree | 81b5dc5aff57bf8bd1edf6b0a99f4d523efcd225 | |
| parent | app-portage/prefix-toolkit(prefix-stack-setup): accept --chost argument (diff) | |
| download | prefix-toolkit-fdb7c261ad5228907b77b7ad0d0328b2c2635deb.tar.gz prefix-toolkit-fdb7c261ad5228907b77b7ad0d0328b2c2635deb.tar.bz2 prefix-toolkit-fdb7c261ad5228907b77b7ad0d0328b2c2635deb.zip | |
app-portage/prefix-toolkit (prefix-stack-setup): revbumpprefix-toolkit-4
We do not want to have CBUILD build deps in prefix-stack, but CHOST
build deps only. Since EAPI 7 there is BDEPEND, but EAPI 6 and older
have both CBUILD and CHOST build deps in DEPEND. As most CHOST build
deps also are in RDEPEND anyway, we omit EAPI 6 DEPEND from prefix-stack
by setting EMERGE_DEFAULT_OPTS="--root-deps=rdeps" - ignored for EAPI 7.
Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>
(cherry picked from commit 5e3e580aa799fd7849b974179f894fcef2a25d5e)
| -rw-r--r-- | prefix-stack-setup | 3 | ||||
| -rw-r--r-- | prefix-toolkit-4.ebuild (renamed from prefix-toolkit-3.ebuild) | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/prefix-stack-setup b/prefix-stack-setup index 2d7ec10..2b0d56e 100644 --- a/prefix-stack-setup +++ b/prefix-stack-setup @@ -131,6 +131,9 @@ ebegin "creating make.conf" echo "EPREFIX=\"${CHILD_EPREFIX}\"" echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" echo "BROOT=\"${PARENT_EPREFIX}\"" + # Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6. + # We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only. + echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\"" if [[ -n ${CHILD_CHOST} ]] ; then echo "CHOST=\"${CHILD_CHOST}\"" fi diff --git a/prefix-toolkit-3.ebuild b/prefix-toolkit-4.ebuild index e4719f8..511787e 100644 --- a/prefix-toolkit-3.ebuild +++ b/prefix-toolkit-4.ebuild @@ -445,6 +445,9 @@ ebegin "creating make.conf" echo "EPREFIX=\"${CHILD_EPREFIX}\"" echo "PORTAGE_OVERRIDE_EPREFIX=\"${PARENT_EPREFIX}\"" echo "BROOT=\"${PARENT_EPREFIX}\"" + # Since EAPI 7 there is BDEPEND, which is DEPEND in EAPI up to 6. + # We do not want to pull DEPEND from EAPI <= 6, but RDEPEND only. + echo "EMERGE_DEFAULT_OPTS=\"--root-deps=rdeps\"" if [[ -n ${CHILD_CHOST} ]] ; then echo "CHOST=\"${CHILD_CHOST}\"" fi |