From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D3010158020 for ; Tue, 20 Dec 2022 18:13:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1803BE091B; Tue, 20 Dec 2022 18:13:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F3EE4E091B for ; Tue, 20 Dec 2022 18:13:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF2E0340F1E for ; Tue, 20 Dec 2022 18:13:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41D687D3 for ; Tue, 20 Dec 2022 18:13:40 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1671559982.e93067af16c354c35efd3e674b083c5861456038.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-2.06-r4.ebuild sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e93067af16c354c35efd3e674b083c5861456038 X-VCS-Branch: master Date: Tue, 20 Dec 2022 18:13:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2de69d19-4d3c-427c-8de0-71f3d7f42aeb X-Archives-Hash: 0df628cd346d33e48a0ab367965c8761 commit: e93067af16c354c35efd3e674b083c5861456038 Author: Mike Gilbert gentoo org> AuthorDate: Tue Dec 20 18:06:50 2022 +0000 Commit: Mike Gilbert gentoo 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 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