commit: e93067af16c354c35efd3e674b083c5861456038 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Dec 20 18:06:50 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Dec 20 18:13:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93067af
sys-boot/grub: force LEX=flex GRUB's configure script checks the version of flex by calling ${LEX} --version. If app-alternatives/lex[reflex] is installed, this version check will fail. Closes: https://bugs.gentoo.org/887211 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-boot/grub/grub-2.06-r4.ebuild | 5 ++++- sys-boot/grub/grub-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-boot/grub/grub-2.06-r4.ebuild b/sys-boot/grub/grub-2.06-r4.ebuild index 10638d064406..04ab2f692a59 100644 --- a/sys-boot/grub/grub-2.06-r4.ebuild +++ b/sys-boot/grub/grub-2.06-r4.ebuild @@ -86,7 +86,7 @@ REQUIRED_USE=" BDEPEND=" ${PYTHON_DEPS} - sys-devel/flex + >=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo @@ -262,6 +262,9 @@ src_configure() { tc-export CC NM OBJCOPY RANLIB STRIP tc-export BUILD_CC BUILD_PKG_CONFIG + # Force configure to use flex, bug 887211. + export LEX=flex + MULTIBUILD_VARIANTS=() local p for p in "${GRUB_ALL_PLATFORMS[@]}"; do diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 477b43363226..a256108539c8 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -82,7 +82,7 @@ REQUIRED_USE=" BDEPEND=" ${PYTHON_DEPS} - sys-devel/flex + >=sys-devel/flex-2.5.35 sys-devel/bison sys-apps/help2man sys-apps/texinfo @@ -258,6 +258,9 @@ src_configure() { tc-export CC NM OBJCOPY RANLIB STRIP tc-export BUILD_CC BUILD_PKG_CONFIG + # Force configure to use flex, bug 887211. + export LEX=flex + MULTIBUILD_VARIANTS=() local p for p in "${GRUB_ALL_PLATFORMS[@]}"; do