make flex/bison optional provided by OpenADK, fix logic to create Depends.mk

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));
 					}

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