Re: [cp-patches] Re: [commit-cp] classpath ./ChangeLog lib/Makefile.am m4/acincl...

[Dalibor Topic]

Mark Wielaard wrote:
> Hi Dalibor,
>
> On Tue, 2005-12-13 at 01:20 +0000, Dalibor Topic wrote:
>
> > Log message:
> >         Build breakage fix for jikes 1.19
> >         
> >         2005-12-12  Dalibor Topic  <address@hidden>
> >         
> >         Fixes bug #25353
> >         * m4/acinclude.m4: Added JIKESWARNINGS makefile variable.
> >         Only add +Pno-shadow to JIKESWARNINGS if not using jikes 1.19.
> >         * lib/Makefile.am: Use JIKESWARNINGS instead of explicitely
> >         listing the warnings.
>
>
> Nice, this seems to work fine for me.
> But the patch never made it to classpath-patches.
> Could you repost it?
Yes, of course, sorry about the inconvenience. Patch attached.

cheers,
dalibor topic

===================================================================
RCS file: /var/lib/cvs/sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- classpath/classpath/m4/acinclude.m4 2005/09/11 23:20:18     1.7
+++ classpath/classpath/m4/acinclude.m4 2005/12/13 01:20:29     1.8
@@ -135,9 +135,18 @@
 
     JIKESENCODING=
     if test -n "`$JIKES --help 2>&1 | grep encoding`"; then
-       JIKESENCODING='-encoding UTF-8'
+      JIKESENCODING='-encoding UTF-8'
     fi
     AC_SUBST(JIKESENCODING)
+
+    JIKESWARNINGS="+Pno-switchcheck"
+    if test "x$JIKES_VERSION_MAJOR" = x"1" ; then
+      if ! test "x$JIKES_VERSION_MINOR" = x"19"; then
+        JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow"
+      fi
+    fi
+    AC_SUBST(JIKESWARNINGS)
+
   fi
 ])
 
===================================================================
RCS file: /var/lib/cvs/sources/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- classpath/classpath/lib/Makefile.am 2005/12/05 13:25:00     1.105
+++ classpath/classpath/lib/Makefile.am 2005/12/13 01:20:29     1.106
@@ -19,7 +19,7 @@
 JAVAC = exit 1
 else
 if FOUND_JIKES
-JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) 
-bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) 
-d . @classes
+JAVAC = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath '' 
-extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
 else
 if FOUND_KJC
 ## FIXME: from what I can tell, kjc does not support a -encoding option.