Skip to contentSkip to conversation

openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

PATCH In review Eric Bénard 2 participants 5 messages Jan 15, 2012 – Jan 19, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 openjdk-6-6b24: fix icedtea-launcher-stdc++.patch

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!
---
 .../openjdk-6-6b24/icedtea-launcher-stdc++.patch   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch +1 -1
index ebe34e7..b97745d 100644
@@ -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
Signature · 1 line
1.7.7.5
#1 lore raw

PATCH 2/2 README: add a note concerning libstdc++-static

which is required for icedtea6-native

---
 README |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
README +2 -0
index 926e5bf..803b4de 100644
@@ -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 [email protected]
 
Signature · 1 line
1.7.7.5
#2 lore raw

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

Quoted 13 lines · Eric Bénard

which is required for icedtea6-native

---
 README |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
README +0 -0
index 926e5bf..803b4de 100644

README PREFERRED_VERSION_cacaoh-native = "0.99.3" · line 25

Quoted 8 lines
README +2 -0
@@ -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 [email protected]
 

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

#3 lore raw
In reply to Eric Bénard
Quoted 26 lines · 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!
---
 .../openjdk-6-6b24/icedtea-launcher-stdc++.patch   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
recipes-core/openjdk/openjdk-6-6b24/icedtea-launcher-stdc++.patch +1 -1
index ebe34e7..b97745d 100644
@@ -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
Signature · 1 line
1.7.7.5

Thanks Eric,

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

Bye Henning

#4 lore raw

Hi Henning,

Quoted 2 lines · Henning Heinold

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