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

login
register
mail settings
Submitter Eric BENARD
Date Jan. 15, 2012, 4:42 p.m.
Message ID <1326645768-13447-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/19397/
State Accepted
Headers show

Comments

Eric BENARD - Jan. 15, 2012, 4:42 p.m.
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(-)
Henning Heinold - Jan. 18, 2012, 5:34 p.m.
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
Eric BENARD - Jan. 18, 2012, 9:08 p.m.
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

Patch

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