commit: bddcef62229d2a58f04924e848a014980e6f47bf Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Mar 21 03:10:59 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Mar 21 03:10:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddcef62
sys-boot/grub: bootstrap gnulib in the live ebuild Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-boot/grub/grub-9999.ebuild | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 662c83807ee..0663509415e 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,6 +6,7 @@ EAPI=6 if [[ ${PV} == 9999 ]]; then GRUB_AUTOGEN=1 GRUB_AUTORECONF=1 + GRUB_BOOTSTRAP=1 fi if [[ -n ${GRUB_AUTOGEN} ]]; then @@ -136,6 +137,11 @@ QA_MULTILIB_PATHS="usr/lib/grub/.*" src_unpack() { if [[ ${PV} == 9999 ]]; then git-r3_src_unpack + cd "${P}" || die + local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git" + local GNULIB_REVISION=$(source bootstrap.conf; echo "${GNULIB_REVISION}") + git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" + git-r3_checkout "${GNULIB_URI}" gnulib fi default } @@ -160,11 +166,15 @@ src_prepare() { if [[ -n ${GRUB_AUTOGEN} ]]; then python_setup - bash autogen.sh || die + if [[ -n ${GRUB_BOOTSTRAP} ]]; then + eautopoint --force + AUTOPOINT=: AUTORECONF=: ./bootstrap || die + else + ./autogen.sh || die + fi fi if [[ -n ${GRUB_AUTORECONF} ]]; then - autopoint() { :; } eautoreconf fi }