[meta-java 1/2] openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

[meta-java 1/2] openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

[Eric Bénard]

without this fix I get (on a FC16) :
| Checking patches/icedtea-launcher-stdc++.patch
| /usr/bin/patch: **** rejecting absolute target file name: /openjdk/hotspot/make/linux/makefiles/launcher.make
| ERROR patch patches/icedtea-launcher-stdc++.patch FAILED!

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 .../openjdk-6-6b24/icedtea-launcher-stdc++.patch   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
index ebe34e7..b97745d 100644
--- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
+++ b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
@@ -1,7 +1,7 @@
 Index: openjdk/hotspot/make/linux/makefiles/launcher.make
 ===================================================================
 --- openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:33:37.000000000 +0100
-+++ /openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:37:54.055022618 +0100
++++ openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:37:54.055022618 +0100
 @@ -51,7 +51,7 @@
  else
    LAUNCHER.o                 = launcher.o
-- 
1.7.7.5

[meta-java 2/2] README: add a note concerning libstdc++-static

[Eric Bénard]

which is required for icedtea6-native

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 README |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/README b/README
index 926e5bf..803b4de 100644
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ PREFERRED_VERSION_cacaoh-native = "0.99.3"
 PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.11"
 PREFERRED_VERSION_icedtea6-native = "1.8.11"
 
+Please note that libstdc++ static is needed on your host to compile icedtea6-native
+(install libstdc++-static on a Fedora).
 
 Send pull requests to openembedded-devel@lists.openembedded.org
 
-- 
1.7.7.5

Re: [meta-java 1/2] openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

[Henning Heinold]

On Sun, Jan 15, 2012 at 05:42:47PM +0100, Eric Bénard wrote:
> without this fix I get (on a FC16) :
> | Checking patches/icedtea-launcher-stdc++.patch
> | /usr/bin/patch: **** rejecting absolute target file name: /openjdk/hotspot/make/linux/makefiles/launcher.make
> | ERROR patch patches/icedtea-launcher-stdc++.patch FAILED!
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  .../openjdk-6-6b24/icedtea-launcher-stdc++.patch   |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
> index ebe34e7..b97745d 100644
> --- a/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
> +++ b/recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch
> @@ -1,7 +1,7 @@
>  Index: openjdk/hotspot/make/linux/makefiles/launcher.make
>  ===================================================================
>  --- openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:33:37.000000000 +0100
> -+++ /openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:37:54.055022618 +0100
> ++++ openjdk/hotspot/make/linux/makefiles/launcher.make	2011-12-20 10:37:54.055022618 +0100
>  @@ -51,7 +51,7 @@
>   else
>     LAUNCHER.o                 = launcher.o
> -- 
> 1.7.7.5
> 

Thanks Eric,

Patch is apllied, but I still wonder why I didnt saw it here.

Bye Henning

Re: [meta-java 2/2] README: add a note concerning libstdc++-static

[Henning Heinold]

On Sun, Jan 15, 2012 at 05:42:48PM +0100, Eric Bénard wrote:
> which is required for icedtea6-native
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>
> ---
>  README |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/README b/README
> index 926e5bf..803b4de 100644
> --- a/README
> +++ b/README
> @@ -18,6 +18,8 @@ PREFERRED_VERSION_cacaoh-native = "0.99.3"
>  PREFERRED_VERSION_openjdk-6-jre = "6b18-1.8.11"
>  PREFERRED_VERSION_icedtea6-native = "1.8.11"
>  
> +Please note that libstdc++ static is needed on your host to compile icedtea6-native
> +(install libstdc++-static on a Fedora).
>  
>  Send pull requests to openembedded-devel@lists.openembedded.org
>  
> -- 

I applied this patch. Jamvm and cacao seems to be stable now, so maybe we
can compile the target openjdk with them again.

Bye Henning

Re: [meta-java 1/2] openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

[Eric Bénard]

Hi Henning,

Le Wed, 18 Jan 2012 18:34:55 +0100,
Henning Heinold <heinold@inf.fu-berlin.de> a écrit :
> Patch is apllied, but I still wonder why I didnt saw it here.
> 
patch --version
patch 2.6.1

Maybe this check was added to a newer patch version and you are using a
previous one ?

Eric