mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
Config.in: remove BR2_NEEDS_HOST_JAVA
Buildroot commitaac3d2b402added a hidden boolean option that packages which depend on java on the host can select. Since buildroot commit5366b8f734we 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> Signed-off-by: Arnout Vandecappelle <arnout@rnout.be>
This commit is contained in:
committed by
Arnout Vandecappelle
parent
b6a2f49429
commit
7b97765046
@@ -101,11 +101,6 @@ config BR2_HOST_GCC_AT_LEAST_15
|
|||||||
# When adding new entries above, be sure to update
|
# When adding new entries above, be sure to update
|
||||||
# the HOSTCC_MAX_VERSION variable in the Makefile.
|
# 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
|
# Hidden boolean selected by pre-built packages for x86, when they
|
||||||
# need to run on x86-64 machines (example: pre-built external
|
# need to run on x86-64 machines (example: pre-built external
|
||||||
# toolchains, binary tools, etc.).
|
# toolchains, binary tools, etc.).
|
||||||
|
|||||||
@@ -217,17 +217,6 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then
|
|||||||
fi
|
fi
|
||||||
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 grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
|
||||||
if test ! -f /lib/ld-linux.so.2 ; then
|
if test ! -f /lib/ld-linux.so.2 ; then
|
||||||
echo
|
echo
|
||||||
|
|||||||
@@ -113,8 +113,6 @@ async def fixup_config(sysinfo, configfile):
|
|||||||
|
|
||||||
ROOTFS_SIZE = '5G'
|
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
|
# libffi not available on ARMv7-M, but propagating libffi arch
|
||||||
# dependencies in Buildroot is really too much work, so we handle
|
# dependencies in Buildroot is really too much work, so we handle
|
||||||
# this here.
|
# this here.
|
||||||
|
|||||||
Reference in New Issue
Block a user