diff options
Diffstat (limited to 'adk/tools')
| -rw-r--r-- | adk/tools/Makefile | 6 | ||||
| -rw-r--r-- | adk/tools/pkgmaker.c | 27 |
2 files changed, 4 insertions, 29 deletions
diff --git a/adk/tools/Makefile b/adk/tools/Makefile index fd0a3c791..dec651462 100644 --- a/adk/tools/Makefile +++ b/adk/tools/Makefile @@ -6,12 +6,12 @@ include $(ADK_TOPDIR)/rules.mk install: ${STAGING_HOST_DIR}/usr/bin/depmaker ${STAGING_HOST_DIR}/usr/bin/pkgrebuild ${STAGING_HOST_DIR}/usr/bin/dkgetsz ${STAGING_HOST_DIR}/usr/bin/depmaker: depmaker.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ depmaker.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ depmaker.c ${STAGING_HOST_DIR}/usr/bin/pkgrebuild: pkgrebuild.c strmap.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ pkgrebuild.c strmap.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ pkgrebuild.c strmap.c ${STAGING_HOST_DIR}/usr/bin/dkgetsz: dkgetsz.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ dkgetsz.c include $(ADK_TOPDIR)/mk/tools.mk diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 30a0d11ca..e4306d7cc 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -353,7 +353,7 @@ int main() { char *pkg_name, *pkg_depends, *pkg_kdepends, *pkg_needs, *pkg_depends_system, *pkg_depends_libc, *pkg_section, *pkg_descr, *pkg_url; char *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; + char *pkg_libc_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, *sname, *sname2; int result; @@ -377,7 +377,6 @@ int main() { pkg_subpkgs = NULL; pkg_arch_depends = NULL; pkg_system_depends = NULL; - pkg_host_depends = NULL; pkg_libc_depends = NULL; pkg_dflt = NULL; pkg_cfline = NULL; @@ -574,8 +573,6 @@ int main() { continue; if ((parse_var(buf, "PKG_LIBC_DEPENDS", NULL, &pkg_libc_depends)) == 0) continue; - if ((parse_var(buf, "PKG_HOST_DEPENDS", NULL, &pkg_host_depends)) == 0) - 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) @@ -864,26 +861,6 @@ int main() { free(pkg_helper); pkg_helper = NULL; } - /* create package host dependency information */ - if (pkg_host_depends != NULL) { - pkg_helper = strdup(pkg_host_depends); - token = strtok(pkg_helper, " "); - fprintf(cfg, "\tdepends on "); - sp = ""; - while (token != NULL) { - if(strncmp(token, "!", 1) == 0) { - fprintf(cfg, "%s!ADK_HOST%s", sp, toupperstr(token)); - sp = " && "; - } else { - fprintf(cfg, "%sADK_HOST_%s", sp, toupperstr(token)); - sp = " || "; - } - token = strtok(NULL, " "); - } - fprintf(cfg, "\n"); - free(pkg_helper); - pkg_helper = NULL; - } /* create package libc dependency information */ if (pkg_libc_depends != NULL) { @@ -1248,7 +1225,6 @@ int main() { free(pkg_subpkgs); free(pkg_arch_depends); free(pkg_system_depends); - free(pkg_host_depends); free(pkg_libc_depends); free(pkg_dflt); free(pkg_cfline); @@ -1266,7 +1242,6 @@ int main() { pkg_subpkgs = NULL; pkg_arch_depends = NULL; pkg_system_depends = NULL; - pkg_host_depends = NULL; pkg_libc_depends = NULL; pkg_dflt = NULL; pkg_cfline = NULL; |