[Buildroot] [PATCH 3/3] Config.in: remove BR2_NEEDS_HOST_JAVA

[Bernd Kuhls <bernd@kuhls.net>]

Buildroot commit aac3d2b402fd2b8b91f125cf9314f4805b88f72a added a hidden
boolean option that packages which depend on java on the host can select.

Since buildroot commit 5366b8f734fe7aff7e95c1f92627265c5a75becc we can
provide our own host-openjdk-bin package.

Kodi previously used BR2_NEEDS_HOST_JAVA but was switched to host-open-
jdk-bin in this series.
The option BR2_NEEDS_HOST_JAVA is now unused and can be removed.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 Config.in                            |  5 -----
 support/dependencies/dependencies.sh | 11 -----------
 utils/genrandconfig                  |  2 --
 3 files changed, 18 deletions(-)

diff --git a/Config.in b/Config.in
index 0bfe6d1ab5..ac58c685d1 100644
--- a/Config.in
+++ b/Config.in
@@ -101,11 +101,6 @@ config BR2_HOST_GCC_AT_LEAST_15
 # When adding new entries above, be sure to update
 # the HOSTCC_MAX_VERSION variable in the Makefile.
 
-# Hidden boolean selected by packages in need of Java in order to build
-# (example: kodi)
-config BR2_NEEDS_HOST_JAVA
-	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, etc.).
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index 9c2aeaf23f..f44723678e 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -217,17 +217,6 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then
 	fi
 fi
 
-if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then
-	check_prog_host "java"
-	JAVA_GCJ=$(java -version 2>&1 | grep gcj)
-	if [ ! -z "$JAVA_GCJ" ] ; then
-		echo
-		echo "$JAVA_GCJ is not sufficient to compile your package selection."
-		echo "Please install an OpenJDK/IcedTea/Oracle Java."
-		exit 1 ;
-	fi
-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 5ebd552a1d..727c8193c4 100755
--- a/utils/genrandconfig
+++ b/utils/genrandconfig
@@ -113,8 +113,6 @@ async def fixup_config(sysinfo, configfile):
 
     ROOTFS_SIZE = '5G'
 
-    if "BR2_NEEDS_HOST_JAVA=y\n" in configlines and not await sysinfo.has("java"):
-        return False
     # libffi not available on ARMv7-M, but propagating libffi arch
     # dependencies in Buildroot is really too much work, so we handle
     # this here.
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot