diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-26 09:37:51 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-26 09:37:51 +0000 |
| commit | f8f6978b0be160111bf9478b4c48196538e788d2 (patch) | |
| tree | d0d41298e736c781a93fc7ec3b7ff2285901aa2c /packages/classpath/files | |
| parent | 9f039bc749f5e0c95b2a466064b1014441b22e37 (diff) | |
classpath: fix config.rpath, autotools and ecj -d
* add ecj_java_dir.patch for issuse when ecj is not cable to
to create directory-structure with parameter -d
* add autotools.patch for m4 stuff
* copy config.rpath always from /usr/share/gettext, so no crude hacks are
needed anymore
* bump PR on all recipes
Diffstat (limited to 'packages/classpath/files')
| -rw-r--r-- | packages/classpath/files/autotools.patch | 37 | ||||
| -rw-r--r-- | packages/classpath/files/ecj_java_dir.patch | 34 |
2 files changed, 71 insertions, 0 deletions
diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch new file mode 100644 index 0000000000..baae366d5f --- /dev/null +++ b/packages/classpath/files/autotools.patch @@ -0,0 +1,37 @@ +Index: classpath-0.93/configure.ac +=================================================================== +--- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100 ++++ classpath-0.93/configure.ac 2008-08-25 22:07:40.711946598 +0200 +@@ -41,6 +41,11 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ ++ ++AM_ICONV_LINK ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +@@ -312,6 +317,7 @@ + dnl AC_PROG_AWK + AC_PROG_CC + AC_PROG_CPP ++AM_PROG_CC_C_O + + # Handle -Werror default case. + if test "$ENABLE_WERROR" = default; then +Index: classpath-0.93/Makefile.am +=================================================================== +--- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100 ++++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200 +@@ -4,7 +4,7 @@ + SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + +-ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = -I m4 --install + + native: lib + diff --git a/packages/classpath/files/ecj_java_dir.patch b/packages/classpath/files/ecj_java_dir.patch new file mode 100644 index 0000000000..e310567516 --- /dev/null +++ b/packages/classpath/files/ecj_java_dir.patch @@ -0,0 +1,34 @@ +Index: classpath-0.97.2/lib/gen-classlist.sh.in +=================================================================== +--- classpath-0.97.2.orig/lib/gen-classlist.sh.in 2008-06-02 03:37:29.000000000 +0200 ++++ classpath-0.97.2/lib/gen-classlist.sh.in 2008-08-01 00:00:58.055208770 +0200 +@@ -148,4 +148,7 @@ + done + fi + ++# hack for javac that uses -d and do not make the directories ++awk -F " " '{print $1}' classes.1 | uniq | awk -F " " '{system("mkdir -p " $0)}' ++ + exit 0 +Index: classpath-0.97.2/tools/Makefile.am +=================================================================== +--- classpath-0.97.2.orig/tools/Makefile.am 2008-06-02 04:01:47.000000000 +0200 ++++ classpath-0.97.2/tools/Makefile.am 2008-08-01 00:11:18.531985989 +0200 +@@ -180,6 +180,8 @@ + mkdir classes asm + ## Compile ASM separately as it is latin-1 encoded. + find $(srcdir)/external/asm -name '*.java' -print > asm.lst ++ awk -F "/" '{OFS=FS;gsub("/"$$2"/"$$3,"",$$0);gsub("/"$$NF,"",$$0); print $$0}' asm.lst | \ ++ sort | uniq | awk -F " " '{system("mkdir -p asm/" $$0)}' + AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ + $$AC -g -d asm @asm.lst + find $(srcdir)/gnu/classpath/tools \ +@@ -189,6 +191,8 @@ + $(srcdir)/com/sun/tools/javah \ + $(srcdir)/sun/rmi/rmic \ + -name '*.java' -print > classes.lst ++ awk -F "/" '{OFS=FS;gsub("/"$$NF,"",$$0); print $$0}' classes.lst | \ ++ sort | uniq | awk -F " " '{system("mkdir -p classes/" $$0)}' + $(JCOMPILER) -g -d classes @classes.lst + cat classes.lst asm.lst > all-classes.lst + ## Copy over tools resource files. |