diff options
author | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2008-03-27 18:45:00 +0000 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@gmail.com> | 2008-03-27 18:45:00 +0000 |
commit | bab0bc1011c17ac35ac7499b3db23fa85419e05f (patch) | |
tree | 26fe87bc48e130d6f1b1a0c1c990622c1c48d63c /packages/gcc/gcc-3.4.4/jarfix.patch | |
parent | e3ba7f3f4a1345008ca97eab8663150fb00b10da (diff) | |
parent | 6775017f8db3583d4166f48f937bc339b97d0b35 (diff) |
merge of '487f86d7da4356e5d8c6832b7ff5f0ee9ab8c293'
and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'
Diffstat (limited to 'packages/gcc/gcc-3.4.4/jarfix.patch')
-rw-r--r-- | packages/gcc/gcc-3.4.4/jarfix.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/packages/gcc/gcc-3.4.4/jarfix.patch b/packages/gcc/gcc-3.4.4/jarfix.patch new file mode 100644 index 0000000000..082daf4a7e --- /dev/null +++ b/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 |