1 |
commit: 56e6e30263e56771de876c0e053561a54fd19ed1 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 1 03:04:53 2023 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 03:11:06 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e6e302 |
7 |
|
8 |
sys-boot/grub: force Bison too |
9 |
|
10 |
Already in BDEPEND, just unset to avoid having to explicitly say bison vs bison -y. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/887211 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
sys-boot/grub/grub-2.06-r4.ebuild | 5 +++-- |
16 |
sys-boot/grub/grub-9999.ebuild | 5 +++-- |
17 |
2 files changed, 6 insertions(+), 4 deletions(-) |
18 |
|
19 |
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild b/sys-boot/grub/grub-2.06-r4.ebuild |
20 |
index 04ab2f692a59..e60b3f92314c 100644 |
21 |
--- a/sys-boot/grub/grub-2.06-r4.ebuild |
22 |
+++ b/sys-boot/grub/grub-2.06-r4.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2022 Gentoo Authors |
25 |
+# Copyright 1999-2023 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
@@ -262,8 +262,9 @@ src_configure() { |
30 |
tc-export CC NM OBJCOPY RANLIB STRIP |
31 |
tc-export BUILD_CC BUILD_PKG_CONFIG |
32 |
|
33 |
- # Force configure to use flex, bug 887211. |
34 |
+ # Force configure to use flex & bison, bug 887211. |
35 |
export LEX=flex |
36 |
+ unset YACC |
37 |
|
38 |
MULTIBUILD_VARIANTS=() |
39 |
local p |
40 |
|
41 |
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild |
42 |
index a256108539c8..43b43e84e76b 100644 |
43 |
--- a/sys-boot/grub/grub-9999.ebuild |
44 |
+++ b/sys-boot/grub/grub-9999.ebuild |
45 |
@@ -1,4 +1,4 @@ |
46 |
-# Copyright 1999-2022 Gentoo Authors |
47 |
+# Copyright 1999-2023 Gentoo Authors |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
|
50 |
EAPI=7 |
51 |
@@ -258,8 +258,9 @@ src_configure() { |
52 |
tc-export CC NM OBJCOPY RANLIB STRIP |
53 |
tc-export BUILD_CC BUILD_PKG_CONFIG |
54 |
|
55 |
- # Force configure to use flex, bug 887211. |
56 |
+ # Force configure to use flex & bison, bug 887211. |
57 |
export LEX=flex |
58 |
+ unset YACC |
59 |
|
60 |
MULTIBUILD_VARIANTS=() |
61 |
local p |