diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-11-02 20:53:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-11-02 20:53:11 +0100 |
| commit | e1abc1b8aa9f8486d69119a0851207e6995b8eb8 (patch) | |
| tree | 6f0931e7c455cf28341dabba6815bc5a7a09a1d6 | |
| parent | 47fd761b81a0c6729d4e833740d050f4e22e7184 (diff) | |
make flex/bison optional provided by OpenADK, fix logic to create Depends.mk
| -rw-r--r-- | adk/tools/depmaker.c | 8 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 16 |
2 files changed, 13 insertions, 11 deletions
diff --git a/adk/tools/depmaker.c b/adk/tools/depmaker.c index ad2328d9e..620bdb9e9 100644 --- a/adk/tools/depmaker.c +++ b/adk/tools/depmaker.c @@ -133,8 +133,10 @@ static char *parse_line(char *package, char *pkgvar, char *string, int checksym, } strncat(depvar, dep, strlen(dep)-5); if ((strncmp(depvar, "bc", 2) == 0) || + (strncmp(depvar, "bison", 5) == 0) || (strncmp(depvar, "bzip2", 5) == 0) || (strncmp(depvar, "file", 4) == 0) || + (strncmp(depvar, "flex", 4) == 0) || (strncmp(depvar, "gawk", 4) == 0) || (strncmp(depvar, "grep", 4) == 0) || (strncmp(depvar, "patch", 5) == 0) || @@ -163,7 +165,7 @@ static char *parse_line(char *package, char *pkgvar, char *string, int checksym, if (check_symbol(key_sym) != 0) { free(key_sym); free(depvar); - return(NULL); + break; } free(key_sym); free(depvar); @@ -252,7 +254,7 @@ int main() { string = strstr(buf, "PKG_BUILDDEP:="); if (string != NULL) { - tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0, &prefix); + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 2, 0, 0, &prefix); if (tmp != NULL) { strncat(pkgdeps, tmp, strlen(tmp)); } @@ -260,7 +262,7 @@ int main() { string = strstr(buf, "PKG_BUILDDEP+="); if (string != NULL) { - tmp = parse_line(pkgdirp->d_name, pkgvar, string, 0, 0, 0, &prefix); + tmp = parse_line(pkgdirp->d_name, pkgvar, string, 2, 0, 0, &prefix); if (tmp != NULL) strncat(pkgdeps, tmp, strlen(tmp)); } diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index b01becf42..344ad497e 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -19,18 +19,10 @@ config ADK_HOST_BUILD_AUTOMAKE bool default y -config ADK_HOST_BUILD_BISON - bool - default y - config ADK_HOST_BUILD_FAKEROOT bool default n -config ADK_HOST_BUILD_FLEX - bool - default y - config ADK_HOST_BUILD_M4 bool default y @@ -57,6 +49,10 @@ config ADK_HOST_BUILD_BC select ADK_HOST_BUILD_FLEX default n +config ADK_HOST_BUILD_BISON + bool + default n + config ADK_HOST_BUILD_BZIP2 bool default n @@ -74,6 +70,10 @@ config ADK_HOST_BUILD_FINDUTILS bool default n +config ADK_HOST_BUILD_FLEX + bool + default n + config ADK_HOST_BUILD_GAWK bool default y if ADK_HOST_DARWIN |