diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-04-30 14:44:58 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-04-30 14:46:01 -0400 |
| commit | fe420281b87aaf017e0bf6d201184c1fa977b9a6 (patch) | |
| tree | a74c1f26ad434b0d8919acbfea5f0e0b4d602e43 /sys-boot | |
| parent | profiles/thirdpartymirrors: remove sourceforge (diff) | |
| download | gentoo-fe420281b87aaf017e0bf6d201184c1fa977b9a6.tar.gz gentoo-fe420281b87aaf017e0bf6d201184c1fa977b9a6.tar.bz2 gentoo-fe420281b87aaf017e0bf6d201184c1fa977b9a6.zip | |
sys-boot/grub: depend on python unconditionally
configure calls PYTHON in a couple of places, so we need python even if
we are not regenerating the build system.
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/grub-2.12-r4.ebuild | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild b/sys-boot/grub/grub-2.12-r4.ebuild index 9755d0e4ee49..66b37086f92f 100644 --- a/sys-boot/grub/grub-2.12-r4.ebuild +++ b/sys-boot/grub/grub-2.12-r4.ebuild @@ -21,15 +21,11 @@ PYTHON_COMPAT=( python3_{10..12} ) WANT_LIBTOOL=none VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg -if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - inherit python-any-r1 -fi - if [[ -n ${GRUB_AUTORECONF} ]]; then inherit autotools fi -inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs +inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 toolchain-funcs DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="https://www.gnu.org/software/grub/" @@ -168,11 +164,7 @@ src_prepare() { default - if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - python_setup - else - export PYTHON=true - fi + python_setup if [[ -n ${GRUB_BOOTSTRAP} ]]; then eautopoint --force diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 3e36233d4ef0..1061d6ebe58d 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -25,15 +25,11 @@ PYTHON_COMPAT=( python3_{10..12} ) WANT_LIBTOOL=none VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg -if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - inherit python-any-r1 -fi - if [[ -n ${GRUB_AUTORECONF} ]]; then inherit autotools fi -inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs +inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 toolchain-funcs DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="https://www.gnu.org/software/grub/" @@ -169,11 +165,7 @@ src_prepare() { default - if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then - python_setup - else - export PYTHON=true - fi + python_setup if [[ -n ${GRUB_BOOTSTRAP} ]]; then eautopoint --force |