diff options
| author | Maxime Hadjinlian <maxime.hadjinlian@gmail.com> | 2014-05-04 00:45:44 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-06-14 19:55:28 +0200 |
| commit | 8f9da282b299c667a20b636d7512144283fd92c0 (patch) | |
| tree | e24d6508c6885d4c960bd5721e45f0eb1b1b7681 | |
| parent | 8575332f0d32d88135284eb58b6af59f6808d0db (diff) | |
| download | buildroot-8f9da282b299c667a20b636d7512144283fd92c0.tar.gz buildroot-8f9da282b299c667a20b636d7512144283fd92c0.zip | |
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: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | Config.in | 10 | ||||
| -rw-r--r-- | package/classpath/Config.in | 2 | ||||
| -rwxr-xr-x | support/dependencies/dependencies.sh | 18 |
3 files changed, 20 insertions, 10 deletions
@@ -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.). diff --git a/package/classpath/Config.in b/package/classpath/Config.in index 0153bca070..a11845c75e 100644 --- a/package/classpath/Config.in +++ b/package/classpath/Config.in @@ -1,5 +1,7 @@ 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 diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 655b4c6346..255a07b08f 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -187,20 +187,18 @@ 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 - fi - done -fi - if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" 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 |
