aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Julien Olivain <ju.o@free.fr>2020-11-12 13:01:54 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-11-15 16:07:48 +0100
commit5110efaa330f029880a238ccefacfb11ea36947e (patch)
tree576a077645197901f344f5f87ad0d1ef0b27746c
parent1eceb1ec8afa25c3d719bad47510988e501287aa (diff)
downloadbuildroot-5110efaa330f029880a238ccefacfb11ea36947e.tar.gz
buildroot-5110efaa330f029880a238ccefacfb11ea36947e.tar.bz2
package/linux-backports: use flex and bison to generate kconfig parser
Upstream backports package does not define the LEX/YACC Makefile variables, contrary to the Kernel which is defining those in [1]. The default "lex" and "yacc" are then used. On some systems, "yacc" is Berkeley Yacc. Kconfig parser files are using non-Posix Bison constructs. Attempting to generate the parser with byacc fails with error: yacc: e - line 97 of "zconf.y", syntax error %destructor { ^ This patch defines the LEX and YACC Makefile variable to use flex and bison, to fix this issue. The host-bison and host-flex dependencies are added only if the host does not have them, following the same logic of the Kernel. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=73a4f6dbe70a1b93c11e2d1d6ca68f3522daf434 Signed-off-by: Julien Olivain <ju.o@free.fr> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit ec493ea4899f7be6500f495a32b4150feff355ef) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/linux-backports/linux-backports.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk
index 1d7d6e7f00..030d7a2864 100644
--- a/package/linux-backports/linux-backports.mk
+++ b/package/linux-backports/linux-backports.mk
@@ -11,6 +11,14 @@ LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stab
LINUX_BACKPORTS_LICENSE = GPL-2.0
LINUX_BACKPORTS_LICENSE_FILES = COPYING
+# flex and bison are needed to generate kconfig parser. We use the
+# same logic as the linux kernel (we add host dependencies only if
+# host does not have them). See linux/linux.mk and
+# support/dependencies/check-host-bison-flex.mk.
+LINUX_BACKPORTS_DEPENDENCIES = \
+ $(BR2_BISON_HOST_DEPENDENCY) \
+ $(BR2_FLEX_HOST_DEPENDENCY)
+
ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y)
LINUX_BACKPORTS_KCONFIG_FILE = $(LINUX_BACKPORTS_DIR)/defconfigs/$(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG))
else ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG),y)
@@ -33,6 +41,8 @@ LINUX_BACKPORTS_KCONFIG_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS)
# LINUX_BACKPORTS_MODULE_MAKE_OPTS is used by the kernel-module infra.
#
LINUX_BACKPORTS_MAKE_OPTS = \
+ LEX=flex \
+ YACC=bison \
BACKPORT_DIR=$(@D) \
KLIB_BUILD=$(LINUX_DIR) \
KLIB=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \