diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /tools | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/adk/pkgmaker.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index 7b79bfb72..77bc0d648 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -271,7 +271,7 @@ int main() { 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_host_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; + char *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; char *packages, *pkg_name_u, *pkgs; char *saveptr, *p_ptr, *s_ptr; int result; @@ -287,6 +287,7 @@ int main() { pkg_choices = NULL; pkg_subpkgs = NULL; pkg_arch_depends = NULL; + pkg_system_depends = NULL; pkg_host_depends = NULL; pkg_cxx = NULL; pkg_dflt = NULL; @@ -397,6 +398,8 @@ int main() { continue; if ((parse_var(buf, "PKG_ARCH_DEPENDS", NULL, &pkg_arch_depends)) == 0) continue; + if ((parse_var(buf, "PKG_SYSTEM_DEPENDS", NULL, &pkg_system_depends)) == 0) + continue; if ((parse_var(buf, "PKG_DESCR", NULL, &pkg_descr)) == 0) continue; if ((parse_var(buf, "PKG_SECTION", NULL, &pkg_section)) == 0) @@ -609,6 +612,23 @@ int main() { } memset(hkey, 0, MAXVAR); + /* create package target system dependency information */ + if (pkg_system_depends != NULL) { + token = strtok(pkg_system_depends, " "); + fprintf(cfg, "\tdepends on "); + sp = ""; + while (token != NULL) { + if(strncmp(token, "!", 1) == 0) { + fprintf(cfg, "%s!ADK_TARGET_SYSTEM%s", sp, toupperstr(token)); + sp = " && "; + } else { + fprintf(cfg, "%sADK_TARGET_SYSTEM_%s", sp, toupperstr(token)); + sp = " || "; + } + token = strtok(NULL, " "); + } + fprintf(cfg, "\n"); + } /* create package host dependency information */ if (pkg_host_depends != NULL) { token = strtok(pkg_host_depends, " "); @@ -880,6 +900,7 @@ int main() { free(pkg_choices); free(pkg_subpkgs); free(pkg_arch_depends); + free(pkg_system_depends); free(pkg_host_depends); free(pkg_cxx); free(pkg_dflt); @@ -895,6 +916,7 @@ int main() { pkg_choices = NULL; pkg_subpkgs = NULL; pkg_arch_depends = NULL; + pkg_system_depends = NULL; pkg_host_depends = NULL; pkg_cxx = NULL; pkg_dflt = NULL; |