[oe-commits] org.oe.dev gcc-3.4.4: Add patch to fix jar location from poky

[rpurdie commit]

gcc-3.4.4: Add patch to fix jar location from poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d6a364589bf45cf11180a9e175bee5699012c9dd
ViewMTN: http://monotone.openembedded.org/revision/info/d6a364589bf45cf11180a9e175bee5699012c9dd
Files:
1
packages/gcc/gcc-3.4.4/jarfix.patch
packages/gcc/gcc-3.4.4.inc
Diffs:

#
# mt diff -r34c033109aac6298c98e8b68f1998dd135b8a062 -rd6a364589bf45cf11180a9e175bee5699012c9dd
#
#
#
# add_file "packages/gcc/gcc-3.4.4/jarfix.patch"
#  content [b7ebfebc20d5a343ab160db19578d8e002f38ad7]
# 
# patch "packages/gcc/gcc-3.4.4.inc"
#  from [73b4aafdf30109a7505a9fb445c964fa76353192]
#    to [b6121dbf8fda33791722c94759192ce86145319f]
#
============================================================
--- packages/gcc/gcc-3.4.4/jarfix.patch	b7ebfebc20d5a343ab160db19578d8e002f38ad7
+++ packages/gcc/gcc-3.4.4/jarfix.patch	b7ebfebc20d5a343ab160db19578d8e002f38ad7
@@ -0,0 +1,30 @@
+ libjava/Makefile.am |    2 +-
+ libjava/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-3.4.4/libjava/Makefile.am
+===================================================================
+--- gcc-3.4.4.orig/libjava/Makefile.am	2006-12-05 15:37:50.000000000 +0000
++++ gcc-3.4.4/libjava/Makefile.am	2006-12-05 15:38:27.000000000 +0000
+@@ -77,7 +77,7 @@ if NULL_TARGET
+ ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ GCJH = gcjh
+ else
+-ZIP = jar
++ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ GCJH = $(target_alias)-gcjh
+ endif
+ else # CANADIAN
+Index: gcc-3.4.4/libjava/Makefile.in
+===================================================================
+--- gcc-3.4.4.orig/libjava/Makefile.in	2006-12-05 15:39:08.000000000 +0000
++++ gcc-3.4.4/libjava/Makefile.in	2006-12-05 15:39:21.000000000 +0000
+@@ -193,7 +193,7 @@ propdir = $(libdir)
+ 
+ bin_SCRIPTS = addr2name.awk
+ @CANADIAN_TRUE@@NULL_TARGET_TRUE at ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+- at CANADIAN_TRUE@@NULL_TARGET_FALSE at ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE at jar
++ at CANADIAN_TRUE@@NULL_TARGET_FALSE at ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_FALSE at ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_TRUE@@NULL_TARGET_TRUE at GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE at gcjh
+ @CANADIAN_TRUE@@NULL_TARGET_FALSE at GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh
============================================================
--- packages/gcc/gcc-3.4.4.inc	73b4aafdf30109a7505a9fb445c964fa76353192
+++ packages/gcc/gcc-3.4.4.inc	b6121dbf8fda33791722c94759192ce86145319f
@@ -13,6 +13,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/g
 	   file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
 	   file://GCC3.4.0VisibilityPatch.diff;patch=1 \
 	   file://15342.patch;patch=1 \
+	   file://jarfix.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1 \
 	   file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1 \
 	   file://zecke-xgcc-cpp.patch;patch=1 \