From b59da8fc7b46ee62cbe9eb97a05c8a0f1ab75593 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 7 Nov 2013 16:55:09 +0100 Subject: update valgrind to latest upstream version, strlen is not a function in ld.so in latest glibc/eglibc setups, just remove the redirect for now. enable automatic building of debug subpackages. update TODO --- tools/adk/pkgmaker.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index 6af7a0fa7..d00e7302f 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -270,7 +270,7 @@ int main() { char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd; char *pkg_name, *pkg_depends, *pkg_section, *pkg_descr, *pkg_url; char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt, *pkg_multi; - char *pkg_need_cxx, *pkg_need_java, *pkgname; + char *pkg_need_cxx, *pkg_need_java, *pkgname, *pkg_debug; char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname; char *saveptr, *p_ptr, *s_ptr, *pkg_helper; @@ -300,6 +300,7 @@ int main() { pkg_need_java = NULL; pkgname = NULL; pkg_helper = NULL; + pkg_debug = NULL; p_ptr = NULL; s_ptr = NULL; @@ -635,6 +636,9 @@ int main() { fprintf(cfg, "comment \"%s... %s (disabled, c++ missing)\"\n", token, pkg_descr); fprintf(cfg, "depends on !ADK_TOOLCHAIN_GCC_CXX\n\n"); } + + /* save token in pkg_debug */ + pkg_debug = strdup(token); fprintf(cfg, "config ADK_PACKAGE_%s\n", toupperstr(token)); /* no prompt for devonly packages */ if (pkg_opts != NULL) { @@ -819,6 +823,16 @@ int main() { pkg_cxx = NULL; } + /* handle debug subpackages */ + fprintf(cfg, "\nconfig ADK_PACKAGE_%s_DBG\n", toupperstr(pkg_debug)); + fprintf(cfg, "\tprompt \"add debug symbols package\"\n"); + fprintf(cfg, "\ttristate\n"); + fprintf(cfg, "\tdepends on ADK_PACKAGE_GDB\n"); + fprintf(cfg, "\tdepends on !ADK_DEBUG\n"); + fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkg_debug)); + fprintf(cfg, "\tdefault n\n"); + fprintf(cfg, "\thelp\n\n"); + /* package flavours */ if (pkg_flavours != NULL) { token = strtok(pkg_flavours, " "); -- cgit v1.2.3