From 003fa5200f523ed2db5e90234a2e2f761d39b2e6 Mon Sep 17 00:00:00 2001 From: Daniel McGregor Date: Thu, 20 May 2021 10:58:20 -0600 Subject: bison: Make libtextstyle and libreadline optional Bison opportunistically enables libtextstyle and libreadline support if they're installed on the build host. Since textstyle and readline aren't part of uninative avoid host contamination by making their support configurable and disabled by default in the native case. (From OE-Core rev: 286e60702aa1d8448efc703fa40735e079e6a027) Signed-off-by: Daniel McGregor Signed-off-by: Richard Purdie --- meta/recipes-devtools/bison/bison_3.7.6.bb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_3.7.6.bb b/meta/recipes-devtools/bison/bison_3.7.6.bb index a7f01c3299..a8d57f2742 100644 --- a/meta/recipes-devtools/bison/bison_3.7.6.bb +++ b/meta/recipes-devtools/bison/bison_3.7.6.bb @@ -15,10 +15,25 @@ SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ " SRC_URI[sha256sum] = "67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf" +inherit autotools gettext texinfo + # No point in hardcoding path to m4, just use PATH -EXTRA_OECONF += "M4=m4" +CACHED_CONFIGUREVARS = "ac_cv_path_M4=m4" -inherit autotools gettext texinfo +PACKAGECONFIG ??= "readline ${@ 'textstyle' if d.getVar('USE_NLS') == 'yes' else ''}" +PACKAGECONFIG_class-native ??= "" + +# Make readline and textstyle optional. There are recipie for these, but leave them +# disabled for the native recipe. This prevents host contamination of the native tool. +PACKAGECONFIG[readline] = "--with-libreadline-prefix,--without-libreadline-prefix,readline" +PACKAGECONFIG[textstyle] = "--with-libtextstyle-prefix,--without-libtextstyle-prefix,gettext" + +# Include the cached configure variables, configure is really good at finding +# libreadline, even if we don't want it. +CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'readline', '', ' \ + ac_cv_header_readline_history_h=no \ + ac_cv_header_readline_readline_h=no \ + gl_cv_lib_readline=no', d)}" # The automatic m4 path detection gets confused, so force the right value acpaths = "-I ./m4" -- cgit v1.2.3-54-g00ecf