diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-08 14:07:13 +0200 |
| commit | 4f64f833872a6c83dd95149a553b9ed5258b4efe (patch) | |
| tree | 1d653351e49b62def18e74af5b18d6cb2a848a79 /jtools/classpath/patches/classpath-fix.patch | |
| parent | ee418b2a37c2e45bd35625157dbc1b59fcacf8c7 (diff) | |
| parent | c20e67a4a06a377a277544a498338fa6a09e9e3f (diff) | |
resolve conflict
Diffstat (limited to 'jtools/classpath/patches/classpath-fix.patch')
| -rw-r--r-- | jtools/classpath/patches/classpath-fix.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/jtools/classpath/patches/classpath-fix.patch b/jtools/classpath/patches/classpath-fix.patch new file mode 100644 index 000000000..e03eb2342 --- /dev/null +++ b/jtools/classpath/patches/classpath-fix.patch @@ -0,0 +1,12 @@ +diff -Nur classpath-0.98.orig//lib/Makefile.in classpath-0.98/lib/Makefile.in +--- classpath-0.98.orig//lib/Makefile.in 2009-02-06 02:01:32.000000000 +0100 ++++ classpath-0.98/lib/Makefile.in 2011-08-05 22:55:25.965284504 +0200 +@@ -272,7 +272,7 @@ + uudecode = @uudecode@ + vm_classes = @vm_classes@ + JAVA_DEPEND = java.dep +-compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(PATH_TO_GLIBJ_ZIP):$(PATH_TO_ESCHER) ++compile_classpath = $(vm_classes) -cp $(top_srcdir) -cp $(top_srcdir)/external/w3c_dom -cp $(top_srcdir)/external/sax -cp $(top_srcdir)/external/relaxngDatatype -cp $(top_srcdir)/external/jsr166 -cp . -cp $(PATH_TO_GLIBJ_ZIP) -cp $(PATH_TO_ESCHER) + @GCJ_JAVAC_FALSE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) $(JAVAC_MEM_OPT) -source 1.5 -target 1.5 -bootclasspath '' -classpath $(compile_classpath) -d . @classes + + # handling source to bytecode compiler programs like gcj, jikes and kjc |