From 3d31baf4a109a7a7b2626449e8327286963c15cd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 16 Jun 2014 18:00:57 +0200 Subject: add support for libc dependent dependencies --- adk/tools/pkgmaker.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'adk/tools/pkgmaker.c') diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 1e87536d5..02e561aa0 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -327,7 +327,7 @@ int main() { char dir[MAXPATH]; char variable[2*MAXVAR]; char *key, *value, *token, *cftoken, *sp, *hkey, *val, *pkg_fd; - char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_section, *pkg_descr, *pkg_url; + char *pkg_name, *pkg_depends, *pkg_depends_system, *pkg_depends_libc, *pkg_section, *pkg_descr, *pkg_url; char *pkg_cxx, *pkg_subpkgs, *pkg_cfline, *pkg_dflt; char *pkgname, *sysname, *pkg_debug, *pkg_bb; char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; @@ -343,6 +343,7 @@ int main() { pkg_url = NULL; pkg_depends = NULL; pkg_depends_system = NULL; + pkg_depends_libc = NULL; pkg_opts = NULL; pkg_libname = NULL; pkg_flavours = NULL; @@ -567,6 +568,8 @@ int main() { continue; if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_system, &pkg_depends_system, &sysname, 12)) == 0) continue; + if ((parse_var_with_system(buf, "PKG_DEPENDS_", pkg_depends_libc, &pkg_depends_libc, &sysname, 12)) == 0) + continue; if ((parse_var(buf, "PKG_LIBNAME", pkg_libname, &pkg_libname)) == 0) continue; if ((parse_var(buf, "PKG_OPTS", pkg_opts, &pkg_opts)) == 0) @@ -897,6 +900,16 @@ int main() { free(pkg_depends_system); pkg_depends_system = NULL; } + /* create libc specific package dependency information */ + if (pkg_depends_libc != NULL) { + token = strtok(pkg_depends_libc, " "); + while (token != NULL) { + fprintf(cfg, "\tselect ADK_PACKAGE_%s if ADK_TARGET_LIB_%s\n", toupperstr(token), sysname); + token = strtok(NULL, " "); + } + free(pkg_depends_libc); + pkg_depends_libc = NULL; + } if (pkg_bb != NULL) { fprintf(cfg, "\tdepends on !ADK_PACKAGE_BUSYBOX_HIDE\n"); -- cgit v1.2.3