From 301fbac58eb4c024e3eda0dc13251bd5849be791 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 13 Nov 2008 17:55:16 +0000 Subject: Merge 1199 and 1200 from /devel/YEM-build_host_target_cleanup: - Allow hand-indentation in the kconfig prompts - Start documenting the kconfig deviations from the kernel's version /trunk/kconfig/menu.c | 10 8 2 0 ++++++++-- /trunk/docs/overview.txt | 6 6 0 0 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/overview.txt b/docs/overview.txt index 92af992..cd476d8 100644 --- a/docs/overview.txt +++ b/docs/overview.txt @@ -524,6 +524,12 @@ Kconfig parser | The kconfig language is a hacked version, vampirised from the Linux kernel (http://www.kernel.org/), and (heavily) adapted to my needs. +The list of the most notable changes (at least the ones I remember) follows: +- the CONFIG_ prefix has been replaced with CT_ +- a leading | in prompts is skipped, and subsequent leading spaces are not + trimmed +- otherwise leading spaces are silently trimmed + The kconfig parsers (conf and mconf) are not installed pre-built, but as source files. Thus you can have the directory where crosstool-NG is installed, exported (via NFS or whatever) and have clients with different architectures diff --git a/kconfig/menu.c b/kconfig/menu.c index 07ff8d1..b8113cc 100644 --- a/kconfig/menu.c +++ b/kconfig/menu.c @@ -128,8 +128,14 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e prop->visible.expr = menu_check_dep(dep); if (prompt) { - if (isspace(*prompt)) { - prop_warn(prop, "leading whitespace ignored"); + /* For crostool-NG, a leading pipe followed with spaces + * means that pipe shall be removed, and the spaces should + * not be trimmed. + */ + if (*prompt == '|') + prompt++; + else if (isspace(*prompt)) { + /* Silently trim leading spaces */ while (isspace(*prompt)) prompt++; } -- cgit v0.10.2-6-g49f6