From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WrN4h-0001xg-G6 for ptxdist@pengutronix.de; Mon, 02 Jun 2014 09:54:31 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1WrN4q-00068a-Ou for ptxdist@pengutronix.de; Mon, 02 Jun 2014 09:54:40 +0200 Date: Mon, 2 Jun 2014 09:54:40 +0200 From: Michael Olbrich Message-ID: <20140602075440.GJ26228@pengutronix.de> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Subject: Re: [ptxdist] [PATCH] classpath: Fix JAVA autoconf variable Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 > --- > 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