diff options
author | Alexey Neyman <stilor@att.net> | 2018-11-23 22:14:07 -0800 |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2018-12-01 10:10:51 -0800 |
commit | 40d5bf64408a0e103f8149f941ea50fbbb11dc91 (patch) | |
tree | 67532a4e3a2498ab5663bb400649ec847ced6ba7 /scripts/show-config.sh | |
parent | 172308cb1be5b23c816c19d0b9c84ba4910cbe80 (diff) | |
download | crosstool-ng-40d5bf64408a0e103f8149f941ea50fbbb11dc91.tar.gz crosstool-ng-40d5bf64408a0e103f8149f941ea50fbbb11dc91.tar.bz2 crosstool-ng-40d5bf64408a0e103f8149f941ea50fbbb11dc91.zip |
Add moxiebox as a choice for libc
This required some rework of the libc selection, as moxiebox is a layer on
top of another libc - newlib.
Also, moxiebox'es host VM (`sandbox`) needs a libcrypto on the host. We will
not have it if we're cross-compiling a canadian cross. Fortunately, all moxiebox
needs from libcrypto is SHA256, and it already includes a standalone implementation
of SHA256 in its runtime. Provide a little wrapper that allows moxiebox use
that implementation for the host binary, too.
Also, automate collecting/printing the list of all packages in a given category
(e.g. LIBC or COMP_TOOLS), generate a list of all Kconfig symbols for a given
category.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/show-config.sh')
-rw-r--r-- | scripts/show-config.sh | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/scripts/show-config.sh b/scripts/show-config.sh index 7f2051c6..4bc82e1a 100644 --- a/scripts/show-config.sh +++ b/scripts/show-config.sh @@ -20,34 +20,27 @@ dump_pkgs_desc() { local category="${1}" local field="${2}" + local pkgs shift 2 local show_version - local tmp + local tmp p + eval "pkgs=\"\${CT_ALL_${category}_CHOICES}\"" printf " %-*s :" ${fieldwidth} "${field}" - while [ -n "${1}" ]; do - eval "tmp=\"\${CT_${category}_${1}}\"" + for p in ${pkgs}; do + # FIXME: multiple choices use category_package; single choice + # use category_package for the primary selection and category_package_SHOW + # for all other selections enabled by the primary. Cannot unify this syntax + # without a really extensive change. + eval "tmp=\"\${CT_${category}_${p}}\${CT_${category}_${p}_SHOW}\"" if [ -n "${tmp}" ]; then - CT_GetPkgBuildVersion "${category}" "${1}" show_version + CT_GetPkgBuildVersion "${category}" "${p}" show_version printf " %s" "${show_version}" fi - shift done printf "\n" } -# Dump a short package description with a name and version in a format -# " <name>[-<version>]" -dump_choice_desc() -{ - local category="${1}" - local field="${2}" - local show_version - - CT_GetChoicePkgBuildVersion "${category}" show_version - printf " %-*s : %s\n" ${fieldwidth} "${field}" "${show_version}" -} - # Dump a single sample # Note: we use the specific .config.sample config file dump_single_sample() @@ -88,13 +81,6 @@ dump_single_sample() printf " %-*s : %s\n" ${fieldwidth} "Host" "${CT_HOST}" ;; esac - # FIXME get choice/menu names from generated kconfig files as well - # FIXME get the list of menu components from generated kconfig files - dump_choice_desc KERNEL "OS" - dump_pkgs_desc COMP_LIBS "Companion libs" GMP MPFR MPC ISL CLOOG LIBELF EXPAT NCURSES \ - LIBICONV GETTEXT - dump_choice_desc BINUTILS "Binutils" - dump_choice_desc CC "Compiler" printf " %-*s : %s" ${fieldwidth} "Languages" "C" [ "${CT_CC_LANG_CXX}" = "y" ] && printf ",C++" [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran" @@ -106,9 +92,13 @@ dump_single_sample() [ -n "${CT_CC_LANG_OTHERS}" ] && printf ",${CT_CC_LANG_OTHERS}" printf "\n" - dump_choice_desc LIBC "C library" - dump_pkgs_desc DEBUG "Debug tools" DUMA GDB LTRACE STRACE - dump_pkgs_desc COMP_TOOLS "Companion tools" AUTOCONF AUTOMAKE LIBTOOL M4 MAKE DTC + dump_pkgs_desc KERNEL "OS" + dump_pkgs_desc BINUTILS "Binutils" + dump_pkgs_desc CC "Compiler" + dump_pkgs_desc LIBC "C library" + dump_pkgs_desc DEBUG "Debug tools" + dump_pkgs_desc COMP_LIBS "Companion libs" + dump_pkgs_desc COMP_TOOLS "Companion tools" fi } |