From bc2f38f65c377b1e7ad299eefa2c0b3362879101 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 5 Dec 2006 15:58:02 +0000
Subject: gcc 3.4: Add patch to fix jar issues

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1010 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gcc/gcc-3.4.4/jarfix.patch | 30 ++++++++++++++++++++++++++++++
 meta/packages/gcc/gcc_3.4.4.bb           |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/gcc/gcc-3.4.4/jarfix.patch

diff --git a/meta/packages/gcc/gcc-3.4.4/jarfix.patch b/meta/packages/gcc/gcc-3.4.4/jarfix.patch
new file mode 100644
index 000000000..082daf4a7
--- /dev/null
+++ b/meta/packages/gcc/gcc-3.4.4/jarfix.patch
@@ -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@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
++@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+ @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
+ @CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_alias)-gcjh
diff --git a/meta/packages/gcc/gcc_3.4.4.bb b/meta/packages/gcc/gcc_3.4.4.bb
index 74ce0fedc..69a00582a 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   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"
 
 SRC_URI += "file://gcc34-configure.in.patch;patch=1"
-- 
cgit v1.2.3