summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-12-05 15:58:02 +0000
committerRichard Purdie <richard@openedhand.com>2006-12-05 15:58:02 +0000
commitbc2f38f65c377b1e7ad299eefa2c0b3362879101 (patch)
tree540adbd3e74d92c286f401f84a09c94b724cc72d /meta/packages
parent2886028dd9797f1eb657423133b5f4e2d1bf5952 (diff)
downloadpoky-bc2f38f65c377b1e7ad299eefa2c0b3362879101.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gcc/gcc-3.4.4/jarfix.patch30
-rw-r--r--meta/packages/gcc/gcc_3.4.4.bb3
2 files changed, 32 insertions, 1 deletions
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 0000000000..082daf4a7e
--- /dev/null
+++ b/meta/packages/gcc/gcc-3.4.4/jarfix.patch
@@ -0,0 +1,30 @@
1 libjava/Makefile.am | 2 +-
2 libjava/Makefile.in | 2 +-
3 2 files changed, 2 insertions(+), 2 deletions(-)
4
5Index: gcc-3.4.4/libjava/Makefile.am
6===================================================================
7--- gcc-3.4.4.orig/libjava/Makefile.am 2006-12-05 15:37:50.000000000 +0000
8+++ gcc-3.4.4/libjava/Makefile.am 2006-12-05 15:38:27.000000000 +0000
9@@ -77,7 +77,7 @@ if NULL_TARGET
10 ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
11 GCJH = gcjh
12 else
13-ZIP = jar
14+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
15 GCJH = $(target_alias)-gcjh
16 endif
17 else # CANADIAN
18Index: gcc-3.4.4/libjava/Makefile.in
19===================================================================
20--- gcc-3.4.4.orig/libjava/Makefile.in 2006-12-05 15:39:08.000000000 +0000
21+++ gcc-3.4.4/libjava/Makefile.in 2006-12-05 15:39:21.000000000 +0000
22@@ -193,7 +193,7 @@ propdir = $(libdir)
23
24 bin_SCRIPTS = addr2name.awk
25 @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
26-@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
27+@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
28 @CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
29 @CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
30 @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 74ce0fedcc..69a00582a8 100644
--- a/meta/packages/gcc/gcc_3.4.4.bb
+++ b/meta/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
1PR = "r5" 1PR = "r6"
2DESCRIPTION = "The GNU cc and gcc C compilers." 2DESCRIPTION = "The GNU cc and gcc C compilers."
3HOMEPAGE = "http://www.gnu.org/software/gcc/" 3HOMEPAGE = "http://www.gnu.org/software/gcc/"
4SECTION = "devel" 4SECTION = "devel"
@@ -21,6 +21,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
21 file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \ 21 file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
22 file://GCC3.4.0VisibilityPatch.diff;patch=1 \ 22 file://GCC3.4.0VisibilityPatch.diff;patch=1 \
23 file://15342.patch;patch=1 \ 23 file://15342.patch;patch=1 \
24 file://jarfix.patch;patch=1 \
24 file://always-fixincperm.patch;patch=1" 25 file://always-fixincperm.patch;patch=1"
25 26
26SRC_URI += "file://gcc34-configure.in.patch;patch=1" 27SRC_URI += "file://gcc34-configure.in.patch;patch=1"