6:36 p.m.
Vin Shelton <acs(a)xemacs.org> writes:
From: Jerry James <james(a)xemacs.org>
Subject: [PATCH 21.5] Re: 21.5.10 modules build failure on Solaris 8
To: XEmacs Patches <xemacs-patches(a)xemacs.org>, Raymond Toy
<toy(a)rtp.ericsson.se>
Cc: XEmacs Beta <xemacs-beta(a)xemacs.org>
Date: 14 Jan 2003 16:39:26 -0600
Raymond Toy <toy(a)rtp.ericsson.se> wrote:
> It seems that ellcc is putting the site-include paths before the
> command line -I paths.
It sure is. This fixes it for me. Can you confirm?
lib-src/ChangeLog addition:
2003-01-14 Jerry James <james(a)xemacs.org>
* ellcc.c (do_compile_mode): Search XEmacs directories first for
include files. Thanks to Raymond Toy.
xemacs-21.5 Patch (cvs -q diff -uN lib-src/ellcc.c):
Index: lib-src/ellcc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ellcc.c,v
retrieving revision 1.4
diff -d -u -r1.4 ellcc.c
--- lib-src/ellcc.c 2002/11/18 06:52:23 1.4
+++ lib-src/ellcc.c 2003/01/14 22:34:14
＠＠ -613,6 +613,7 ＠＠
char **exec_argv = xnew (exec_argc + 20, char *);
exec_argv = add_to_argv (exec_argv, ellcc);
+ exec_argv = add_to_argv (exec_argv, ELLCC_CF_ALL);
exec_argv = add_to_argv (exec_argv, ellcflags);
exec_argv = add_to_argv (exec_argv, ellpicflags);
exec_argv = add_to_argv (exec_argv, "-DPIC");
＠＠ -623,7 +624,6 ＠＠
exec_argv = add_to_argv (exec_argv, "-Dxemacs");
#endif
exec_argv = add_to_argv (exec_argv, "-Demacs");
- exec_argv = add_to_argv (exec_argv, ELLCC_CF_ALL);
for (i = 1; i < exec_argc; i++)
{
exec_argv = add_string (exec_argv, xstrdup (prog_argv[exec_args[i]]));
Under Solaris 5.8, after applying your patch, I get the following
errors in 'make install':
make[1]: Entering directory
`/u/shelton2/software/build/SunOS-5.8/xemacs-21.5-2003-01-15/module
s/ldap'
../../lib-src/ellcc -Wall -Wno-switch -Winline -Wmissing-prototypes -Wsign-compare -Wundef
-Wstrict-prototypes -Wpacked -Wshadow -Wmissing-declarations -Wpointer-arith -O2 -pipe
-ffast-math -fno-exceptions --mode=compile --mod-output=eldap.o -I../../src
-I/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/../../src -c
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:162:56: macro
"DEFINE_LREC
ORD_IMPLEMENTATION" requires 10 arguments, but only 9 given
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:162: warning: type
default
s to `int' in declaration of `DEFINE_LRECORD_IMPLEMENTATION'
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:162: warning: data
definit
ion has no type or storage class
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:868: warning: no
previous
prototype for `unload_eldap'
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:112: warning:
`mark_ldap'
defined but not used
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:118: warning:
`print_ldap'
defined but not used
/u/shelton2/software/src/xemacs-21.5-2003-01-15/modules/ldap/eldap.c:142: warning:
`finalize_ld
ap' defined but not used
make[1]: *** [eldap.o] Error 1
make[1]: Leaving directory
`/u/shelton2/software/build/SunOS-5.8/xemacs-21.5-2003-01-15/modules
/ldap'
make: *** [modules/ldap] Error 2
- Vin
8:31 p.m.
New subject: [PATCH 21.5] Module build problem
Vin Shelton <shelton(a)icd.teradyne.com> wrote:
Under Solaris 5.8, after applying your patch, I get the following
errors in 'make install':
Yes, it looks like this is due to Ben's December 16 patch. My patch is
still correct, it just doesn't fix Ben's breakage. :-) We'll accomplish
that with this patch.
src/ChangeLog addition:
2003-01-15 Jerry James <james(a)eecs.ku.edu>
* emodules.h: #undef everything we redefine for module code.
modules/ChangeLog addition:
2003-01-15 Jerry James <james(a)eecs.ku.edu>
* ldap/eldap.c: Apply Ben's postgresql change to LDAP also.
xemacs-21.5 Patch (cvs -q diff -uN):
Index: modules/ldap/eldap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.c,v
retrieving revision 1.3
diff -d -u -r1.3 eldap.c
--- modules/ldap/eldap.c 2002/09/10 15:27:14 1.3
+++ modules/ldap/eldap.c 2003/01/15 20:24:26
＠＠ -100,12 +100,10 ＠＠
return wrap_ldap (ldap);
}
-#ifdef USE_KKCC
-static const struct lrecord_description ldap_description [] = {
+static const struct memory_description ldap_description [] = {
{ XD_LISP_OBJECT, offsetof (struct Lisp_LDAP, host) },
{ XD_END }
};
-#endif /* USE_KKCC */
static Lisp_Object
mark_ldap (Lisp_Object obj)
＠＠ -151,17 +149,9 ＠＠
ldap->ld = NULL;
}
-#ifdef USE_KKCC
-DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap,
- 0, /*dumpable-flag*/
+DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap, 0,
mark_ldap, print_ldap, finalize_ldap,
NULL, NULL, ldap_description, Lisp_LDAP);
-#else /* not USE_KKCC */
-DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap,
- mark_ldap, print_ldap, finalize_ldap,
- NULL, NULL, 0, Lisp_LDAP);
-#endif /* not USE_KKCC */
-
/************************************************************************/
Index: src/emodules.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emodules.h,v
retrieving revision 1.6
diff -d -u -r1.6 emodules.h
--- src/emodules.h 2003/01/12 11:08:12 1.6
+++ src/emodules.h 2003/01/15 20:24:26
＠＠ -82,23 +82,29 ＠＠
/* We should not expose module entities to the portable dumper. */
#if defined(PDUMP) && !defined(EMODULES_DO_NOT_REDEFINE)
+#undef dump_add_root_struct_ptr
#define dump_add_root_struct_ptr(varaddr,descaddr) DO_NOTHING
+#undef dump_add_opaque
#define dump_add_opaque(varaddr,size) DO_NOTHING
+#undef dump_add_root_block
#define dump_add_root_block(ptraddress,desc) DO_NOTHING
#undef dump_add_opaque_int
#define dump_add_opaque_int(int_varaddr) DO_NOTHING
#undef dump_add_opaque_fixnum
#define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING
+#undef dump_add_root_lisp_object
#define dump_add_root_lisp_object(varaddr) DO_NOTHING
+#undef dump_add_weak_object_chain
#define dump_add_weak_object_chain(varaddr) DO_NOTHING
#undef staticpro
#define staticpro(DSF_location) staticpro_nodump(DSF_location)
#undef DEFSYMBOL
-#undef DEFSYMBOL_MULTIWORD_PREDICATE
#define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name)
+#undef DEFSYMBOL_MULTIWORD_PREDICATE
#define DEFSYMBOL_MULTIWORD_PREDICATE(name) \
DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name)
+#undef defsymbol
#define defsymbol(location,name) defsymbol_nodump (location, name)
#endif
--
Jerry James
http://www.ittc.ku.edu/~james/
7983
days inactive
7983
days old
1 comments
2 participants
participants (2)
-
Jerry James -
Vin Shelton