[meta-java][PATCH 1/3] jamvm compile add extra space to argument

[meta-java][PATCH 1/3] jamvm compile add extra space to argument

[Riku Voipio]

Just as safety measure.
---
 recipes-core/jamvm/jamvm.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-core/jamvm/jamvm.inc b/recipes-core/jamvm/jamvm.inc
index da194f7..4677238 100644
--- a/recipes-core/jamvm/jamvm.inc
+++ b/recipes-core/jamvm/jamvm.inc
@@ -36,7 +36,7 @@ do_configure_append_virtclass-native() {
 EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm --enable-ffi"
 
 # Needed for big compilation targets like OpenJDK
-CFLAGS_append_virtclass-native = " -DDEFAULT_MAX_HEAP=1024*MB"
+CFLAGS_append_virtclass-native = " -DDEFAULT_MAX_HEAP=1024*MB "
 
 # Enforce usage of ecj-initial.
 EXTRA_OEMAKE = "JAVAC=${STAGING_BINDIR_NATIVE}/ecj-initial \
-- 
1.8.1.2

[meta-java][PATCH 2/3] jamvm: update to latest in openjdk-7

[Riku Voipio]

jamvm has wrong wrong checksums for version referred. Update
the version to match that is in jamvm_git.bb and make checksums
match.
---
 recipes-core/openjdk/openjdk-7-release-25b30.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
index 363b6e2..60f4f43 100644
--- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
+++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
@@ -43,11 +43,11 @@ CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};nam
 SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
 SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
 
-JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
+JAMVM_VERSION = "ac22c9948434e528ece451642b4ebde40953ee7e"
 JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
 JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
-SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
-SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d"
+SRC_URI[jamvm.md5sum] = "3a67d0f3471bd2d5b2446d91bfa73f73"
+SRC_URI[jamvm.sha256sum] = "4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7"
 
 # Allow overriding this separately
 OEPATCHES = "\
-- 
1.8.1.2

[meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Riku Voipio]

Current IFS mangling blows up on the face:

    | configure:2341: javac  -classpath .: Test.java
    | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b

Simpler command line expansion works just as easy.
---
 recipes-core/jamvm/files/java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes-core/jamvm/files/java b/recipes-core/jamvm/files/java
index 27cf094..9a396a7 100755
--- a/recipes-core/jamvm/files/java
+++ b/recipes-core/jamvm/files/java
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-IFS=""
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm"
-export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip"
-exec jamvm ${1+"$@"}
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/classpath:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/jamvm"
+export BOOTCLASSPATH="/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/jamvm/classes.zip:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/classpath/glibj.zip"
+exec jamvm "$@"
-- 
1.8.1.2

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Eric Bénard]

Hi Riku,

Le Mon, 30 Sep 2013 16:46:11 +0300,
Riku Voipio <riku.voipio@linaro.org> a écrit :

> Current IFS mangling blows up on the face:
> 
>     | configure:2341: javac  -classpath .: Test.java
>     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
> 
> Simpler command line expansion works just as easy.
> ---
>  recipes-core/jamvm/files/java | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes-core/jamvm/files/java b/recipes-core/jamvm/files/java
> index 27cf094..9a396a7 100755
> --- a/recipes-core/jamvm/files/java
> +++ b/recipes-core/jamvm/files/java
> @@ -1,6 +1,5 @@
>  #!/bin/sh
>  
> -IFS=""
> -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm"
> -export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip"
> -exec jamvm ${1+"$@"}
> +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/classpath:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/jamvm"
> +export BOOTCLASSPATH="/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/jamvm/classes.zip:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/classpath/glibj.zip"
> +exec jamvm "$@"

so now we have your path "/srv/oe/build/tmp-eglibc/" hardcoded in the
recipe ;-)

Eric

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Riku Voipio]

On 30 September 2013 16:58, Eric Bénard <eric@eukrea.com> wrote:
> Hi Riku,
>
> Le Mon, 30 Sep 2013 16:46:11 +0300,
> Riku Voipio <riku.voipio@linaro.org> a écrit :
>
>> Current IFS mangling blows up on the face:
>>
>>     | configure:2341: javac  -classpath .: Test.java
>>     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
>>
>> Simpler command line expansion works just as easy.
>> ---
>>  recipes-core/jamvm/files/java | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/recipes-core/jamvm/files/java b/recipes-core/jamvm/files/java
>> index 27cf094..9a396a7 100755
>> --- a/recipes-core/jamvm/files/java
>> +++ b/recipes-core/jamvm/files/java
>> @@ -1,6 +1,5 @@
>>  #!/bin/sh
>>
>> -IFS=""
>> -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm"
>> -export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip"
>> -exec jamvm ${1+"$@"}
>> +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/classpath:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/jamvm"
>> +export BOOTCLASSPATH="/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/jamvm/classes.zip:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/classpath/glibj.zip"
>> +exec jamvm "$@"

> so now we have your path "/srv/oe/build/tmp-eglibc/" hardcoded in the
> recipe ;-)

That is indeed not intended.. I was a bit uncertain with this patch,
as it was not clear to me why the IFS setting was needed.

Riku

Re: [meta-java][PATCH 2/3] jamvm: update to latest in openjdk-7

[Henning Heinold]

On Mon, Sep 30, 2013 at 04:46:10PM +0300, Riku Voipio wrote:
> jamvm has wrong wrong checksums for version referred. Update
> the version to match that is in jamvm_git.bb and make checksums
> match.
> ---
>  recipes-core/openjdk/openjdk-7-release-25b30.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
> index 363b6e2..60f4f43 100644
> --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
> +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
> @@ -43,11 +43,11 @@ CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};nam
>  SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
>  SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
>  
> -JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
> +JAMVM_VERSION = "ac22c9948434e528ece451642b4ebde40953ee7e"
>  JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
>  JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
> -SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
> -SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d"
> +SRC_URI[jamvm.md5sum] = "3a67d0f3471bd2d5b2446d91bfa73f73"
> +SRC_URI[jamvm.sha256sum] = "4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7"
>  
>  # Allow overriding this separately
>  OEPATCHES = "\
> -- 
> 1.8.1.2

Hi,

jamvm version is fine we use the one openjdk 2.3 expect for now, but I have to update the cacao one.

So this patch will be dropped.

Bye Henning

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Henning Heinold]

On Mon, Sep 30, 2013 at 03:58:38PM +0200, Eric Bénard wrote:
> Hi Riku,
> 
> Le Mon, 30 Sep 2013 16:46:11 +0300,
> Riku Voipio <riku.voipio@linaro.org> a écrit :
> 
> > Current IFS mangling blows up on the face:
> > 
> >     | configure:2341: javac  -classpath .: Test.java
> >     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
> > 

Which shell blows it up? With dash on ubuntu its working fine.

Bye Henning

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Eric Bénard]

Le Mon, 30 Sep 2013 22:22:32 +0300,
Riku Voipio <riku.voipio@linaro.org> a écrit :

> On 30 September 2013 16:58, Eric Bénard <eric@eukrea.com> wrote:
> > Hi Riku,
> >
> > Le Mon, 30 Sep 2013 16:46:11 +0300,
> > Riku Voipio <riku.voipio@linaro.org> a écrit :
> >
> >> Current IFS mangling blows up on the face:
> >>
> >>     | configure:2341: javac  -classpath .: Test.java
> >>     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
> >>
> >> Simpler command line expansion works just as easy.
> >> ---
> >>  recipes-core/jamvm/files/java | 7 +++----
> >>  1 file changed, 3 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/recipes-core/jamvm/files/java b/recipes-core/jamvm/files/java
> >> index 27cf094..9a396a7 100755
> >> --- a/recipes-core/jamvm/files/java
> >> +++ b/recipes-core/jamvm/files/java
> >> @@ -1,6 +1,5 @@
> >>  #!/bin/sh
> >>
> >> -IFS=""
> >> -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:STAGING_LIBDIR_NATIVE/classpath:STAGING_LIBDIR_NATIVE/jamvm"
> >> -export BOOTCLASSPATH="STAGING_DATADIR_NATIVE/jamvm/classes.zip:STAGING_DATADIR_NATIVE/classpath/glibj.zip"
> >> -exec jamvm ${1+"$@"}
> >> +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/classpath:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/jamvm"
> >> +export BOOTCLASSPATH="/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/jamvm/classes.zip:/srv/oe/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/classpath/glibj.zip"
> >> +exec jamvm "$@"
> 
> > so now we have your path "/srv/oe/build/tmp-eglibc/" hardcoded in the
> > recipe ;-)
> 
> That is indeed not intended.. I was a bit uncertain with this patch,
> as it was not clear to me why the IFS setting was needed.
> 
sorry can't help you on this point but I've added in copy Henning which
is the original author of this file and the maintainer of meta-java so
he must be the best placed to answer your question.

Eric



Eric

Re: [meta-java][PATCH 2/3] jamvm: update to latest in openjdk-7

[Riku Voipio]

Hi,

On 30 September 2013 22:26, Henning Heinold <heinold@inf.fu-berlin.de> wrote:
> On Mon, Sep 30, 2013 at 04:46:10PM +0300, Riku Voipio wrote:
>> jamvm has wrong wrong checksums for version referred. Update
>> the version to match that is in jamvm_git.bb and make checksums
>> match.
>> ---
>>  recipes-core/openjdk/openjdk-7-release-25b30.inc | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-core/openjdk/openjdk-7-release-25b30.inc b/recipes-core/openjdk/openjdk-7-release-25b30.inc
>> index 363b6e2..60f4f43 100644
>> --- a/recipes-core/openjdk/openjdk-7-release-25b30.inc
>> +++ b/recipes-core/openjdk/openjdk-7-release-25b30.inc
>> @@ -43,11 +43,11 @@ CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};nam
>>  SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73"
>>  SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9"
>>
>> -JAMVM_VERSION = "0972452d441544f7dd29c55d64f1ce3a5db90d82"
>> +JAMVM_VERSION = "ac22c9948434e528ece451642b4ebde40953ee7e"
>>  JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
>>  JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
>> -SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b"
>> -SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d"
>> +SRC_URI[jamvm.md5sum] = "3a67d0f3471bd2d5b2446d91bfa73f73"
>> +SRC_URI[jamvm.sha256sum] = "4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7"
>>
>>  # Allow overriding this separately
>>  OEPATCHES = "\
>> --
>> 1.8.1.2
>
> Hi,
>
> jamvm version is fine we use the one openjdk 2.3 expect for now, but I have to update the cacao one.
>
> So this patch will be dropped.

If you want to keep the current jamvm, you still need to fix the checksums:

wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz

voipio@aimless:~/tmp$ md5sum
jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
f4616713ec609e35aa8070811bd952aa
jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
voipio@aimless:~/tmp$ sha256sum
jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03
jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz

These do not match with the checksums in openjdk-7-release-25b30.inc

Riku

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Riku Voipio]

On 30 September 2013 22:30, Henning Heinold <heinold@inf.fu-berlin.de> wrote:
> On Mon, Sep 30, 2013 at 03:58:38PM +0200, Eric Bénard wrote:
>> Hi Riku,
>>
>> Le Mon, 30 Sep 2013 16:46:11 +0300,
>> Riku Voipio <riku.voipio@linaro.org> a écrit :
>>
>> > Current IFS mangling blows up on the face:
>> >
>> >     | configure:2341: javac  -classpath .: Test.java
>> >     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
>> >
>
> Which shell blows it up? With dash on ubuntu its working fine.

I'm using bash (oe handbook tells to switch /bin/sh from dash to bash.

$ cat test.sh
#!/bin/sh
IFS=""

exec echo jamvm ${1+"$@"}
$ dash test.sh foo bar bar bar
jamvm foo bar bar bar
$ bash test.sh foo bar bar bar
jamvm foobarbarbar
$ vi test.sh

While the simpler version:
$ cat test.sh
#!/bin/sh

exec echo jamvm "$@"
$ dash test.sh foo bar bar bar
jamvm foo bar bar bar
$ bash test.sh foo bar bar bar
jamvm foo bar bar bar

seems to run fine (echo added in both for clarity)

Riku

Re: [meta-java][PATCH 3/3] jamvm/java: allow spaces in arguments

[Henning Heinold]

On Tue, Oct 01, 2013 at 10:44:56AM +0300, Riku Voipio wrote:
> On 30 September 2013 22:30, Henning Heinold <heinold@inf.fu-berlin.de> wrote:
> > On Mon, Sep 30, 2013 at 03:58:38PM +0200, Eric Bénard wrote:
> >> Hi Riku,
> >>
> >> Le Mon, 30 Sep 2013 16:46:11 +0300,
> >> Riku Voipio <riku.voipio@linaro.org> a écrit :
> >>
> >> > Current IFS mangling blows up on the face:
> >> >
> >> >     | configure:2341: javac  -classpath .: Test.java
> >> >     | Invalid maximum heap size: -Xmx1024m-cp/srv/oe/b
> >> >
> >
> > Which shell blows it up? With dash on ubuntu its working fine.
> 
> I'm using bash (oe handbook tells to switch /bin/sh from dash to bash.
> 
> $ cat test.sh
> #!/bin/sh
> IFS=""
> 
> exec echo jamvm ${1+"$@"}
> $ dash test.sh foo bar bar bar
> jamvm foo bar bar bar
> $ bash test.sh foo bar bar bar
> jamvm foobarbarbar
> $ vi test.sh
> 
> While the simpler version:
> $ cat test.sh
> #!/bin/sh
> 
> exec echo jamvm "$@"
> $ dash test.sh foo bar bar bar
> jamvm foo bar bar bar
> $ bash test.sh foo bar bar bar
> jamvm foo bar bar bar
> 
> seems to run fine (echo added in both for clarity)
> 
> Riku

Okay thanks,

patch is now applied.

Bye Henning