summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2019-03-20 23:19:44 -0400
committerMike Gilbert <floppym@gentoo.org>2019-03-20 23:19:44 -0400
commit1e3d98c3aaf9844b67bc0b0b97011626abd394e6 (patch)
treea8b142d4689fb2ac5c354f67ff84441a01430589 /sys-boot
parentsys-boot/grub: bootstrap gnulib in the live ebuild (diff)
downloadgentoo-1e3d98c3aaf9844b67bc0b0b97011626abd394e6.tar.gz
gentoo-1e3d98c3aaf9844b67bc0b0b97011626abd394e6.tar.bz2
gentoo-1e3d98c3aaf9844b67bc0b0b97011626abd394e6.zip
sys-boot/grub: adjust bootstrap logic
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/grub-9999.ebuild18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 0663509415e..c35bda09b14 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -4,12 +4,11 @@
EAPI=6
if [[ ${PV} == 9999 ]]; then
- GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
fi
-if [[ -n ${GRUB_AUTOGEN} ]]; then
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
inherit python-any-r1
fi
@@ -164,14 +163,15 @@ src_prepare() {
tests/util/grub-fs-tester.in \
|| die
- if [[ -n ${GRUB_AUTOGEN} ]]; then
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
python_setup
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- else
- ./autogen.sh || die
- fi
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
fi
if [[ -n ${GRUB_AUTORECONF} ]]; then