Commit 8f9da282 authored by Maxime Hadjinlian's avatar Maxime Hadjinlian Committed by Thomas Petazzoni
Browse files

classpath: Use generic check for host program 



Remove the specific check that was done in dependencies.sh to use the
generic one that were introduced by the previous patch.

Also, introduce, BR2_NEEDS_HOST_JAVAC and BR2_NEEDS_HOST_JAR as it is
needed by classpath.

Signed-off-by: default avatarMaxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8575332f

Config.in

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,16 @@ config BR2_EXTERNAL 
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.).

package/classpath/Config.in

+2 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_CLASSPATH

	bool "classpath"

	select BR2_NEEDS_HOST_JAR

	select BR2_NEEDS_HOST_JAVAC

	depends on BR2_PACKAGE_JAMVM

	depends on BR2_INET_IPV6

	help

support/dependencies/dependencies.sh

+8 −10
Original line number Diff line number Diff line
@@ -187,18 +187,16 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ 
	fi

fi



if grep -q ^BR2_PACKAGE_CLASSPATH=y $BR2_CONFIG ; then

	for prog in javac jar; do

		if ! which $prog > /dev/null ; then

			echo >&2

			echo "You must install '$prog' on your build machine" >&2

			exit 1

if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then

	check_prog_host "java"

fi

	done



if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then

	check_prog_host "javac"

fi



if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then

	check_prog_host "java"

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