Patches for Kaffe 1.0.b1
Alexandre Oliva
kaffe@rufus.w3.org
15 Jul 1998 00:00:37 -0300
--Multipart_Wed_Jul_15_00:00:37_1998-1
Content-Type: text/plain; charset=US-ASCII
Hi!
Some X11-6.3p2 include file #defines calloc to something strange,
because, after applying the first hunk in the attached patch, a parse
error disappeared. . It is always a good idea to #include standard
files before not-so-standard ones... :-)
The second hunk fixes a build problem on SunOS 4.1.3: stdio.h does not
define size_t, that is used in jpeglib.h. stdlib.h does, so I decided
to include it. You might prefer to include sys/types.h, though.
The other hunks allow the location of zlib, jpeg and gmp's include
files and libraries to be specified as CPPFLAGS and LDFLAGS.
After applying these patches, I was able to build Kaffe 1.0.b1 on
sparc-sun-solaris2.5, i686-pc-linux-gnu, mips-sgi-irix6.3,
mips-sgi-irix5.2 and sparc-sun-sunos4.1.3.
Additionally, on IRIX 6.3, I had to set LD="ld -n32" for Kaffe to
build with gcc (egcs 1.0.3a), but, even then, Kaffe would always crash
with the following dynamic linker error:
7205:Kaffe: rld: Error: unresolvable symbol in /n/lang/kaffe-1.0.b1/lib/libkaffevm.so.1.00: sysdepCallMethod
7205:Kaffe: rld: Fatal Error: this executable has unresolvable symbols
Same for IRIX 5.2. I know it is just a matter of porting
sysdepCallMethod to MIPS, but you shouldn't claim IRIX/MIPS
compatibility if it won't run on this platform yet. I have started
re-porting Kaffe to the MIPS platform, but I couldn't find time to
finish it yet. After that, I"ll give `alpha' a try, but I can't
promise anything in the next few weeks. :-(
Another issue: the scripts won't work if Kaffe is not in the PATH.
One possible workaround is to modify the script so that calls
${exec_prefix}/bin/Kaffe instead of just Kaffe; another possibility is
to modify it so that it deduces the correct pathname from $0,
following soft-links and such. What would you prefer?
I also agree that the script is the best place for setting CLASSPATH.
Yet another issue: have you ever considered using `automake' and
`libtool' in Kaffe?
One more: why were the TextEdit sources released with Kaffe 1.0.b1
not present in the latest snapshot? Was it intentional?
--
Alexandre Oliva
mailto:oliva@dcc.unicamp.br mailto:aoliva@acm.org
http://www.dcc.unicamp.br/~oliva
Universidade Estadual de Campinas, SP, Brasil
--Multipart_Wed_Jul_15_00:00:37_1998-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="kaffe-X.diff"
Content-Transfer-Encoding: 7bit
* libraries/clib/awk/X/toolkit.h: #include stdlib.h before
anything else, because some X implementations #define calloc
--- libraries/clib/awt/X/toolkit.h~ Tue Jul 14 01:34:30 1998
+++ libraries/clib/awt/X/toolkit.h Tue Jul 14 22:42:26 1998
@@ -11,9 +11,9 @@
#ifndef __toolkit_h
#define __toolkit_h
+#include <stdlib.h>
#include <X11/Xlib.h>
#include <jni.h>
-#include <stdlib.h>
/*******************************************************************************
--Multipart_Wed_Jul_15_00:00:37_1998-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="kaffe-jpeg-sunos.diff"
Content-Transfer-Encoding: 7bit
* libraries/clib/awk/X/img.c: include stdlib.h (for size_t)
before jpeglib.h
--- libraries/clib/awt/X/img.c~ Tue Jul 14 01:34:30 1998
+++ libraries/clib/awt/X/img.c Tue Jul 14 23:32:22 1998
@@ -12,6 +12,7 @@
#include <setjmp.h>
#include <stdio.h>
+#include <stdlib.h>
#include "jpeglib.h"
#include "config.h"
--Multipart_Wed_Jul_15_00:00:37_1998-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="kaffe-extralibs.diff"
Content-Transfer-Encoding: 7bit
* libraries/clib/native/Makefile.in: use CPPFLAGS and LDFLAGS
from configure environment
* libraries/clib/zip/Makefile.in: ditto
* libraries/clib/math/Makefile.in: ditto
* kaffe/kaffe/Makefile.in: ditto
* kaffe/kaffevm/Makefile.in: ditto
* libraries/clib/management/Makefile.in: ditto
* libraries/clib/awk/Makefile.in: ditto
--- libraries/clib/native/Makefile.in~ Fri Jun 12 21:48:00 1998
+++ libraries/clib/native/Makefile.in Sat Jun 13 04:06:22 1998
@@ -16,8 +16,9 @@
AR= @AR@
RANLIB= @RANLIB@
INCLUDES= -I$(srcdir) -I../../../include -I$(srcdir)/../../../include -I../../../config -I$(srcdir)/../../../config
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
INSTALL= @INSTALL@
INSTALL_DATA= @INSTALL_DATA@
MKDIR= @MKDIR@
@@ -25,7 +26,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PIC@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @STD_LIBRARIES@
KVER= @KVER@
--- libraries/clib/zip/Makefile.in~ Fri Jun 12 21:48:01 1998
+++ libraries/clib/zip/Makefile.in Sat Jun 13 04:07:23 1998
@@ -16,8 +16,9 @@
AR= @AR@
RANLIB= @RANLIB@
INCLUDES= -I$(srcdir) -I../../../include -I$(srcdir)/../../../include -I../../../config -I$(srcdir)/../../../config
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
INSTALL= @INSTALL@
INSTALL_DATA= @INSTALL_DATA@
MKDIR= @MKDIR@
@@ -25,7 +26,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PIC@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @STD_LIBRARIES@ @ZIP_LIBRARIES@
KVER= @KVER@
--- libraries/clib/math/Makefile.in~ Fri Jun 12 21:47:59 1998
+++ libraries/clib/math/Makefile.in Sat Jun 13 04:08:18 1998
@@ -16,8 +16,9 @@
AR= @AR@
RANLIB= @RANLIB@
INCLUDES= -I$(srcdir) -I../../../include -I$(srcdir)/../../../include -I../../../config -I$(srcdir)/../../../config
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
INSTALL= @INSTALL@
INSTALL_DATA= @INSTALL_DATA@
MKDIR= @MKDIR@
@@ -25,7 +26,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PIC@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @STD_LIBRARIES@ @MATH_LIBRARIES@
KVER= @KVER@
--- kaffe/kaffe/Makefile.in~ Fri Jun 12 22:47:54 1998
+++ kaffe/kaffe/Makefile.in Sat Jun 13 06:04:07 1998
@@ -19,7 +19,7 @@
DEPTOOL= @DEPTOOL@
INCLUDES= -I. -I$(srcdir)/../kaffevm -I../../config -I$(srcdir)/../../config -I../../include -I$(srcdir)/../../include
CFLAGS= @CFLAGS@
-LDFLAGS= @KAFFELINK@
+LDFLAGS= @KAFFELINK@ @LDFLAGS@
ALL_CFLAGS= $(CFLAGS) @KAFFEFLAGS@ $(INCLUDES) $(EXTRA_CFLAGS)
LIBS= @NOSHAREDLIBS@
OBJEXT= @OBJEXT@
--- kaffe/kaffevm/Makefile.in~ Tue Jul 14 21:17:45 1998
+++ kaffe/kaffevm/Makefile.in Tue Jul 14 21:19:02 1998
@@ -22,7 +22,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PICVM@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @NET_LIBRARIES@ @STD_LIBRARIES@ @VM_LIBRARIES@
KVER= @KVER@
@@ -30,8 +30,9 @@
LIBEXT= @LIBVMEXT@
INCLUDES= -I. -I$(srcdir) -I$(srcdir)/../../config -I../../config -I../../include -I$(srcdir)/../../include -I../../libraries/clib
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) @KAFFEVMFLAGS@ $(INCLUDES) $(ENGINE_CFLAGS) -DKVER=\"$(KVER)\" $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) @KAFFEVMFLAGS@ $(INCLUDES) $(ENGINE_CFLAGS) -DKVER=\"$(KVER)\" $(EXTRA_CFLAGS)
LIBNAME= libkaffevm
LIB= $(LIBNAME)$(LIBEXT).$(KVER)
--- libraries/clib/management/Makefile.in~ Tue Jul 14 21:20:08 1998
+++ libraries/clib/management/Makefile.in Tue Jul 14 22:30:50 1998
@@ -16,8 +16,9 @@
AR= @AR@
RANLIB= @RANLIB@
INCLUDES= -I$(srcdir) -I../../../include -I$(srcdir)/../../../include -I../../../config -I$(srcdir)/../../../config
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
INSTALL= @INSTALL@
INSTALL_DATA= @INSTALL_DATA@
MKDIR= @MKDIR@
@@ -25,7 +26,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PIC@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @STD_LIBRARIES@
KVER= @KVER@
--- libraries/clib/awt/Makefile.in~ Tue Jul 14 22:31:10 1998
+++ libraries/clib/awt/Makefile.in Tue Jul 14 22:43:20 1998
@@ -16,8 +16,9 @@
AR= @AR@
RANLIB= @RANLIB@
INCLUDES= -I$(srcdir) -I../../../include -I$(srcdir)/../../../include -I../../../config -I$(srcdir)/../../../config -I$(srcdir)/X @X_INCLUDES@
+CPPFLAGS= @CPPFLAGS@
CFLAGS= @CFLAGS@
-ALL_CFLAGS= $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
+ALL_CFLAGS= $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(EXTRA_CFLAGS)
INSTALL= @INSTALL@
INSTALL_DATA= @INSTALL_DATA@
MKDIR= @MKDIR@
@@ -26,7 +27,7 @@
DLLTOOL= @DLLTOOL@
DEPTOOL= @DEPTOOL@
PIC= @PIC@
-LDFLAGS= @LIBSHARE@
+LDFLAGS= @LIBSHARE@ @LDFLAGS@
LIBS= @LIBS@
LDTAIL= @LDTAIL@ @AWTLIB@
KVER= @KVER@
--Multipart_Wed_Jul_15_00:00:37_1998-1--
--EAA04892.900471737/home.virtual-pc.com--
--AAA02726.900471866/grande.dcc.unicamp.br--