Config.in: drop BR2_NEEDS_HOST_{JAVAC,JAR}

With classpath removed, no packages select these symbols any more - So drop
them and their corresponding logic in dependencies.sh / genrandconfig.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in b/Config.in
index 90403037e61ea4117b4d7dd6de027612ea948832..48fd36ff98ecf38229bcdffc808143f518be0fa3 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -63,16 +63,6 @@ config BR2_HOST_GCC_AT_LEAST_9
 config BR2_NEEDS_HOST_JAVA
        bool
 
-# Hidden boolean selected by packages in need of javac in order to build
-# (example: classpath)
-config BR2_NEEDS_HOST_JAVAC
-       bool
-
-# Hidden boolean selected by packages in need of jar in order to build
-# (example: classpath)
-config BR2_NEEDS_HOST_JAR
-       bool
-
 # Hidden boolean selected by pre-built packages for x86, when they
 # need to run on x86-64 machines (example: pre-built external
 # toolchains, binary tools like SAM-BA, etc.).

diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 972f055e32d28d603dc1f50884d379ae4cc08e32..98469bd70ce25e725c73a4d197515f63ba7a3e6c 100755 (executable)
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -204,14 +204,6 @@ if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then
        fi
 fi
 
-if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then
-       check_prog_host "javac"
-fi
-
-if grep -q ^BR2_NEEDS_HOST_JAR=y $BR2_CONFIG ; then
-       check_prog_host "jar"
-fi
-
 if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
        if test ! -f /lib/ld-linux.so.2 ; then
                echo

diff --git a/utils/genrandconfig b/utils/genrandconfig
index 5b60bc21d67c1cbfcf20f03c1d8e50239fe70d42..c79360be89ac4a4058ddd2fd8b433228cd27b4ea 100755 (executable)
--- a/utils/genrandconfig
+++ b/utils/genrandconfig
@@ -206,10 +206,6 @@ def fixup_config(sysinfo, configfile):
 
     if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not sysinfo.has("java"):
         return False
-    if "BR2_NEEDS_HOST_JAVAC=y\n" in configlines and not sysinfo.has("javac"):
-        return False
-    if "BR2_NEEDS_HOST_JAR=y\n" in configlines and not sysinfo.has("jar"):
-        return False
     # python-nfc needs bzr
     if 'BR2_PACKAGE_PYTHON_NFC=y\n' in configlines and not sysinfo.has("bzr"):
         return False