[patch] fix build failure building libjava/classpath/examples

[patch] fix build failure building libjava/classpath/examples

[Matthias Klose]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

The merge of classpath-0.95 did drop the support to build the example files in
libjava/classpath/examples. The following patch use the just built compiler with
the correct classpath to build the examples.

Ok for the trunk?

  Matthias


[-- Attachment #2: cp-examples.diff --]
[-- Type: text/plain, Size: 2013 bytes --]

2007-07-06  Matthias Klose  <doko@ubuntu.com>

	* examples/Makefile.am: Use the just built compiler to build
	the examples.
	* examples/Makefile.in: Regenerate.
Index: examples/Makefile.am
===================================================================
--- examples/Makefile.am	(revision 126369)
+++ examples/Makefile.am	(working copy)
@@ -1,24 +1,24 @@
 ## Input file for automake to generate the Makefile.in used by configure
-GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':'$(top_builddir)/tools/tools.zip'
 
+## GCJ LOCAL: use srcdir to find core classes.
+GLIBJ_BOOTCLASSPATH='$(top_srcdir)/lib'
+GLIBJ_CLASSPATH=$(srcdir)/asm:$(top_srcdir)/tools
+## END GCJ LOCAL
+
 # Setup the compiler to use the GNU Classpath library we just build
-#if FOUND_GCJ
-#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
-#else
-#if FOUND_JIKES
-#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
-#else
+if FOUND_GCJ
+JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):.
+else
 if FOUND_ECJ
-JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
+JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
 else
 if FOUND_JAVAC
-JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
+JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
 else
 error dunno how to setup the JCOMPILER and compile
-#endif
-#endif
-endif
-endif
+endif # FOUND_JAVAC
+endif # FOUND_ECJ
+endif # FOUND_GCJ
 
 # All our example java source files
 EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java

Re: [patch] fix build failure building libjava/classpath/examples

[Tom Tromey]

>>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:

Matthias> The merge of classpath-0.95 did drop the support to build
Matthias> the example files in libjava/classpath/examples. The
Matthias> following patch use the just built compiler with the correct
Matthias> classpath to build the examples.

Matthias> Ok for the trunk?

Do we really want to build and install the examples?
I lean against it -- it seems like clutter to me.
Anyone disagree?

Tom

Re: [patch] fix build failure building libjava/classpath/examples

[Andrew Haley]

Tom Tromey writes:
 > >>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:
 > 
 > Matthias> The merge of classpath-0.95 did drop the support to build
 > Matthias> the example files in libjava/classpath/examples. The
 > Matthias> following patch use the just built compiler with the correct
 > Matthias> classpath to build the examples.
 > 
 > Matthias> Ok for the trunk?
 > 
 > Do we really want to build and install the examples?

No.  Nuke 'em.  :-)

Andrew.

Re: [patch] fix build failure building libjava/classpath/examples

[Matthias Klose]

Andrew Haley schrieb:
> Tom Tromey writes:
>  > >>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:
>  > 
>  > Matthias> The merge of classpath-0.95 did drop the support to build
>  > Matthias> the example files in libjava/classpath/examples. The
>  > Matthias> following patch use the just built compiler with the correct
>  > Matthias> classpath to build the examples.
>  > 
>  > Matthias> Ok for the trunk?
>  > 
>  > Do we really want to build and install the examples?
> 
> No.  Nuke 'em.  :-)
> 
> Andrew.

libjava/classpath/Makefile.am reads:

# lib first, to compile .class files before native code, last examples
SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
DIST_SUBDIRS = lib doc external include native resource scripts tools examples

so these are not built and installed at all. I just discovered this during
packaging, because current versions of the libgcj-doc.deb package do include
these examples.

AFAIU we try to include most things from classpath unmodified, so I'm happy to
keep this patch as a local debian patch; otoh people trying to build these may
see the same failure.

  Matthias