[ptxdist] [PATCH] classpath: Fix JAVA autoconf variable

[ptxdist] [PATCH] classpath: Fix JAVA autoconf variable

[Guillermo Rodriguez Garcia]

JAVA must point to the java binary on the target, not on the host
This is used in the shell scripts in tools/*, which are installed on the target

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 rules/classpath.make |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/rules/classpath.make b/rules/classpath.make
index ad3b7e7..c5aa02f 100644
--- a/rules/classpath.make
+++ b/rules/classpath.make
@@ -32,10 +32,14 @@ CLASSPATH_PATH := PATH=$(CROSS_PATH)
 CLASSPATH_ENV := \
  $(CROSS_ENV) \
  JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \
- JAVA=$(PTXCONF_SETUP_JAVA_SDK)/bin/java \
+ JAVA=jamvm \
  CLASSPATH=$(PTXCONF_SETUP_JAVA_SDK)/jre/lib \
+ ac_cv_prog_java_works=yes \
  ac_cv_prog_javac_is_gcj=no

+# JAVA must point to the java binary on the target, not on the host
+# This is used by the scripts in tools/*
+
 #
 # autoconf
 #
-- 
1.7.0.4

-- 
Guillermo Rodriguez Garcia
guille.rodriguez@gmail.com

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] classpath: Fix JAVA autoconf variable

[Michael Olbrich]

Same tabs/spaces issue here.

On Mon, May 19, 2014 at 12:30:14PM +0200, Guillermo Rodriguez Garcia wrote:
> JAVA must point to the java binary on the target, not on the host
> This is used in the shell scripts in tools/*, which are installed on the target
> 
> Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
> ---
>  rules/classpath.make |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/rules/classpath.make b/rules/classpath.make
> index ad3b7e7..c5aa02f 100644
> --- a/rules/classpath.make
> +++ b/rules/classpath.make
> @@ -32,10 +32,14 @@ CLASSPATH_PATH := PATH=$(CROSS_PATH)
>  CLASSPATH_ENV := \
>   $(CROSS_ENV) \
>   JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \
> - JAVA=$(PTXCONF_SETUP_JAVA_SDK)/bin/java \
> + JAVA=jamvm \

So '$(JAVA)' is never used at build-time, There is only a check for its
existence, right?

>   CLASSPATH=$(PTXCONF_SETUP_JAVA_SDK)/jre/lib \
> + ac_cv_prog_java_works=yes \

... and we overwrite that here.

Looks good I think. Please resend with correct whitespaces.

Michael

>   ac_cv_prog_javac_is_gcj=no
> 
> +# JAVA must point to the java binary on the target, not on the host
> +# This is used by the scripts in tools/*
> +
>  #
>  # autoconf
>  #
> -- 
> 1.7.0.4
> 
> -- 
> Guillermo Rodriguez Garcia
> guille.rodriguez@gmail.com
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de