diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-12-20 13:06:50 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-12-20 13:13:02 -0500 |
| commit | e93067af16c354c35efd3e674b083c5861456038 (patch) | |
| tree | 882752c0baf2c1831208a86714bb44c9bab324f9 | |
| parent | sys-boot/grub: drop 2.06-r3 (diff) | |
| download | gentoo-e93067af16c354c35efd3e674b083c5861456038.tar.gz gentoo-e93067af16c354c35efd3e674b083c5861456038.tar.bz2 gentoo-e93067af16c354c35efd3e674b083c5861456038.zip | |
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@gentoo.org>
| -rw-r--r-- | sys-boot/grub/grub-2.06-r4.ebuild | 5 | ||||
| -rw-r--r-- | 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 |