diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-11 17:18:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-10-11 17:18:57 +0200 |
| commit | caf7cf1a9ceb76481bea92282e886cce420b07ff (patch) | |
| tree | 452028468d49e94d20b5c7cdffad1065a98f52ce /adk | |
| parent | 0bdeb3a8e7a5bf05dee49a8cf42701a51927ec15 (diff) | |
remove already disabled uClibc support, fix wrong PKG_LIBC_DEPENDS
Diffstat (limited to 'adk')
| -rw-r--r-- | adk/tools/depmaker.c | 4 | ||||
| -rw-r--r-- | adk/tools/pkgmaker.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/adk/tools/depmaker.c b/adk/tools/depmaker.c index cee66eaee..dfcd76c9d 100644 --- a/adk/tools/depmaker.c +++ b/adk/tools/depmaker.c @@ -229,9 +229,7 @@ int main() { string[strlen(string)-1] = '\0'; key = strtok(string, ":="); dpkg = strdup(key+13); - if (strncmp("UCLIBC", dpkg, 6) == 0) { - tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix); - } else if (strncmp("UCLIBC_NG", dpkg, 9) == 0) { + if (strncmp("UCLIBC_NG", dpkg, 9) == 0) { tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix); } else if (strncmp("MUSL", dpkg, 4) == 0) { tmp = parse_line(pkgdirp->d_name, dpkg, stringtmp, 1, 0, 2, &prefix); diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index cde0f178d..4dce5ada1 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -414,13 +414,6 @@ int main() { fprintf(cfg, "\tdepends on ADK_TARGET_LIB_UCLIBC_NG\n"); fprintf(cfg, "\thelp\n"); fprintf(cfg, "\t C library header files.\n\n"); - fprintf(cfg, "config ADK_PACKAGE_UCLIBC_DEV\n"); - fprintf(cfg, "\tprompt \"uclibc-dev........... development files for uclibc\"\n"); - fprintf(cfg, "\tboolean\n"); - fprintf(cfg, "\tdefault n\n"); - fprintf(cfg, "\tdepends on ADK_TARGET_LIB_UCLIBC\n"); - fprintf(cfg, "\thelp\n"); - fprintf(cfg, "\t C library header files.\n\n"); fprintf(cfg, "config ADK_PACKAGE_MUSL_DEV\n"); fprintf(cfg, "\tprompt \"musl-dev............. development files for musl\"\n"); fprintf(cfg, "\tboolean\n"); @@ -941,7 +934,7 @@ int main() { fprintf(cfg, "prompt \"C++ library to use\"\n"); fprintf(cfg, "depends on ADK_COMPILE_%s\n\n", toupperstr(pkgdirp->d_name)); fprintf(cfg, "default ADK_COMPILE_%s_WITH_STDCXX if ADK_TARGET_LIB_GLIBC\n", pkg_cxx); - fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC\n\n", pkg_cxx); + fprintf(cfg, "default ADK_COMPILE_%s_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC_NG\n\n", pkg_cxx); fprintf(cfg, "config ADK_COMPILE_%s_WITH_STDCXX\n", pkg_cxx); fprintf(cfg, "\tbool \"GNU C++ library\"\n"); fprintf(cfg, "\tselect ADK_PACKAGE_LIBSTDCXX\n\n"); |