Make comp.libs use generated templates, too

This allows us to include the component-to-package relation in the
generated kconfig files and make use of that information in the
show-config.sh script.

Signed-off-by: Alexey Neyman <stilor@att.net>

1 files changed, 87 insertions, 141 deletions

diff --git a/config/comp_libs.in b/config/comp_libs.in
index 009aac88..55ca2273 100644
--- a/config/comp_libs.in
+++ b/config/comp_libs.in
@@ -4,200 +4,146 @@
 
 menu "Companion libraries"
 
-config COMPLIBS_NEEDED
+config COMPLIBS_CHECK
     bool
+    prompt "Check the companion libraries builds (!!! READ HELP!!!)"
+    help
+      It is highly recommended to check the newly built companion libraries.
+      Unfortunately, this is a very intensive task, and takes a loooong time.
+      
+      Checking the newly built companion libraries is thus disabled by default,
+      but it is suggested that you check them at least once on your machine,
+      and if they work, disable the check on subsequent builds.
+      
+      If you suspect that one (or more) of your companion libraries is the
+      cause for incorrectly generated code, you should answer 'Y' here.
+      Note however that this will take a really long time.
+
+source "config/gen/comp_libs.in"
+
+# FIXME this needs to have a list of options
+# [ ] libfoo for build
+# [ ] libfoo for host (if canadian)
+# [ ] libfoo for target
+#     libfoo options -->
+#
+# Then have other packages *set default* for build/host
+# (but not select, so that user can utilize build's or host's system library)
+# and *select* the target (so that we build it if we must, and let user optionally
+# build it if he wants). Upon any of these options LIBFOO_{BUILD,HOST,TARGET}
+# being set, set LIBFOO_ENABLED and use that as a qualifier for submenu.
+# For now, LIBFOO_NEEDED symbol may or may not user-selectable, and COMP_LIBS_LIBFOO
+# determines whether it is actually built. LIBFOO_NEEDED is currently for build/host
+# and LIBFOO_TARGET (if exists) is for target.
 
 config LIBICONV_NEEDED
-    bool
-    select LIBICONV
-    select COMPLIBS_NEEDED
+    bool "Build local libiconv"
+    default y if CANADIAN || CROSS_NATIVE
+    select COMP_LIBS_LIBICONV
 
 config GETTEXT_NEEDED
-    bool
-    select GETTEXT
+    bool "Build local gettext"
+    default y if CANADIAN || CROSS_NATIVE
     select LIBICONV_NEEDED
-    select COMPLIBS_NEEDED
+    select NCURSES_NEEDED
+    select COMP_LIBS_GETTEXT
 
 config GMP_NEEDED
     def_bool y
-    select GMP
-    select COMPLIBS_NEEDED
+    select COMP_LIBS_GMP
 
 config MPFR_NEEDED
     def_bool y
-    select MPFR
-    select COMPLIBS_NEEDED
+    select GMP_NEEDED
+    select COMP_LIBS_MPFR
 
 config ISL_NEEDED
     bool
-    select ISL
-    select COMPLIBS_NEEDED
+    select GMP_NEEDED
+    select COMP_LIBS_ISL
 
 config CLOOG_NEEDED
     bool
-    select CLOOG
-    select COMPLIBS_NEEDED
+    select GMP_NEEDED
+    select COMP_LIBS_CLOOG
 
 config MPC_NEEDED
     def_bool y
-    select MPC
-    select COMPLIBS_NEEDED
+    select GMP_NEEDED
+    select MPFR_NEEDED
+    select COMP_LIBS_MPC
 
 config LIBELF_NEEDED
     bool
-    select LIBELF
-    select COMPLIBS_NEEDED
+    select COMP_LIBS_LIBELF
+
+config LIBELF_TARGET
+    bool
+    select COMP_LIBS_LIBELF
 
 config EXPAT_NEEDED
     bool
-    select EXPAT
-    select COMPLIBS_NEEDED
+    select COMP_LIBS_EXPAT
+
+config EXPAT_TARGET
+    bool
+    select COMP_LIBS_EXPAT
 
 config NCURSES_NEEDED
     bool
-    select NCURSES
-    select COMPLIBS_NEEDED
+    select COMP_LIBS_NCURSES
 
-config COMPLIBS
+config NCURSES_TARGET
     bool
+    select COMP_LIBS_NCURSES
 
+config ZLIB_NEEDED
+    bool "Build local zlib"
+    select COMP_LIBS_ZLIB
+
+# FIXME remove these legacy knobs
 config LIBICONV
-    bool "Build local libiconv"
-    default y if CANADIAN || CROSS_NATIVE
-    select COMPLIBS
+    def_bool y
+    depends on LIBICONV_NEEDED
 
 config GETTEXT
-    bool "Build local gettext"
-    default y if CANADIAN || CROSS_NATIVE
-    select LIBICONV_NEEDED
-    select NCURSES_NEEDED
-    select COMPLIBS
+    def_bool y
+    depends on GETTEXT_NEEDED
 
 config GMP
-    bool
-    select COMPLIBS
+    def_bool y
+    depends on GMP_NEEDED
 
 config MPFR
-    bool
-    select GMP
-    select COMPLIBS
+    def_bool y
+    depends on MPFR_NEEDED
 
 config ISL
-    bool
-    select GMP
-    select COMPLIBS
+    def_bool y
+    depends on ISL_NEEDED
 
 config CLOOG
-    bool
-    select GMP
-    select COMPLIBS
+    def_bool y
+    depends on CLOOG_NEEDED
 
 config MPC
-    bool
-    select GMP
-    select MPFR
-    select COMPLIBS
+    def_bool y
+    depends on MPC_NEEDED
 
 config LIBELF
-    bool
-    select COMPLIBS
-
-config LIBELF_TARGET
-    bool
+    def_bool y
+    depends on LIBELF_NEEDED
 
 config EXPAT
-    bool
-    select COMPLIBS
-
-config EXPAT_TARGET
-    bool
+    def_bool y
+    depends on EXPAT_NEEDED
 
 config NCURSES
-    bool
-    select COMPLIBS
-
-config NCURSES_TARGET
-    bool
+    def_bool y
+    depends on NCURSES_NEEDED
 
 config ZLIB
-    bool "Build local zlib"
-
-# FIXME this needs to have a list of options
-# [ ] libfoo for build
-# [ ] libfoo for host (if canadian)
-# [ ] libfoo for target
-#     libfoo options -->
-#
-# Then have other packages *set default* for build/host
-# (but not select, so that user can utilize build's or host's system library)
-# and *select* the target (so that we build it if we must, and let user optionally
-# build it if he wants). Upon any of these options LIBFOO_{BUILD,HOST,TARGET}
-# being set, set LIBFOO_ENABLED and use that as a qualifier for submenu.
-# For now, just have comments delineating the libs.
-if ZLIB
-comment "zlib options"
-source "config/comp_libs/zlib.in"
-endif
-if LIBICONV
-comment "libiconv options"
-source "config/comp_libs/libiconv.in"
-endif
-if GETTEXT
-comment "gettext options"
-source "config/comp_libs/gettext.in"
-endif
-if GMP
-comment "GMP options"
-source "config/comp_libs/gmp.in"
-endif
-if MPFR
-comment "MPFR options"
-source "config/comp_libs/mpfr.in"
-endif
-if ISL
-comment "ISL options"
-source "config/comp_libs/isl.in"
-endif
-if CLOOG
-comment "CLooG options"
-source "config/comp_libs/cloog.in"
-endif
-if MPC
-comment "MPC options"
-source "config/comp_libs/mpc.in"
-endif
-if LIBELF || LIBELF_TARGET
-comment "libelf options"
-source "config/comp_libs/libelf.in"
-endif
-if EXPAT || EXPAT_TARGET
-comment "expat options"
-source "config/comp_libs/expat.in"
-endif
-if NCURSES || NCURSES_TARGET
-comment "ncurses options"
-source "config/comp_libs/ncurses.in"
-endif
-
-if COMPLIBS
-
-comment "Companion libraries common options"
-
-config COMPLIBS_CHECK
-    bool
-    prompt "Check the companion libraries builds (!!! READ HELP!!!)"
-    help
-      It is highly recommended to check the newly built companion libraries.
-      Unfortunately, this is a very intensive task, and takes a loooong time.
-      
-      Checking the newly built companion libraries is thus disabled by default,
-      but it is suggested that you check them at least once on your machine,
-      and if they work, disable the check on subsequent builds.
-      
-      If you suspect that one (or more) of your companion libraries is the
-      cause for incorrectly generated code, you should answer 'Y' here.
-      Note however that this will take a really long time.
-
-endif # COMPLIBS
+    def_bool y
+    depends on ZLIB_NEEDED
 
 endmenu