wht@n4hgf.Mt-Park.GA.US (Warren Tucker) (01/29/91)
Submitted-by: wht@n4hgf.Mt-Park.GA.US (Warren Tucker)
Posting-number: Volume 16, Issue 87
Archive-name: ecu3/patch03
Patch-To: ecu3: Volume 16, Issue 25-59
Under XENIX,
1. libmalloc.a and/or libc.a are broken such that calloc is
resolved twice, once from each library.
2. memmove() does not exist (in all or less recent versions?)
To get ecu 3 to compile under XENIX, apply this patch with:
patch < thismessage
NOTE there is no test to see if patch 1 & 2 have been applied :-(
so make sure you have done so. Also, I don't have access to XENIX
right now, so please forgive if this doesn't fly. The object is to
1. supply -DDUFF to use Duff's device instead of missing memmove()
2. remove #define MALLOC_3X and -lmalloc to avoid bug in libmalloc.a
*** /u4/src/ecu3.02/Make.ecu Thu Jan 10 14:04:54 1991
--- Make.ecu Tue Jan 22 14:33:19 1991
***************
*** 45,50
# lint_args.h, please do squirrel away the release copy first
#--------------------------------------------------------------------
#+:EDITS:
#:01-08-1991-03:26-wht@n4hgf-add ISC support
#:11-28-1990-19:45-wht@n4hgf-improve M_ dependency description
#:10-20-1990-14:30-wht@n4hgf-fix bugs found by tbetz@upaya
--- 45,51 -----
# lint_args.h, please do squirrel away the release copy first
#--------------------------------------------------------------------
#+:EDITS:
+ #:01-22-1991-14:33-wht@n4hgf-XENIX calloc/memmove fix
#:01-08-1991-03:26-wht@n4hgf-add ISC support
#:11-28-1990-19:45-wht@n4hgf-improve M_ dependency description
#:10-20-1990-14:30-wht@n4hgf-fix bugs found by tbetz@upaya
***************
*** 92,99
#make some composites based on above
SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286 =ISC ISC`
U3C = $(ZI) -Octl -CSON
! X3C = $(ZI) -Ot -CSON -i
! X2C = -M2let32 -LARGE -F 8000 -Ot -i
CURSES = -DM_TERMCAP
CURSES_LIB = -ltcap -ltermlib
COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
--- 93,100 -----
#make some composites based on above
SYSTEM = `sysdep =M_UNIX UNIX/386 =M_I386 Xenix/386 =M_I286 Xenix/286 =ISC ISC`
U3C = $(ZI) -Octl -CSON
! X3C = -DDUFF $(ZI) -Ot -CSON -i
! X2C = -DDUFF -M2let32 -LARGE -F 8000 -Ot -i
CURSES = -DM_TERMCAP
CURSES_LIB = -ltcap -ltermlib
COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
***************
*** 98,105
CURSES_LIB = -ltcap -ltermlib
COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
! LDSYS = `sysdep =ISC =M_I386 =M_I286 -SEG 256`
! LDFLAGS = $(LDSYS) -lx -lmalloc $(LCRYPT) $(CURSES_LIB)
ECUSHARNAME=ecu3
MANSHARNAME=ecuman3
--- 99,106 -----
CURSES_LIB = -ltcap -ltermlib
COMFLAGS = `sysdep =M_UNIX $(U3C) =M_I386 $(X3C) =M_I286 $(X2C) =ISC $(NONSCO)`
CFLAGS = -DLINT_ARGS $(CURSES) $(CRYPT) $(MORSE) $(NOSEL) $(ADPROC) $(COMFLAGS)
! LDSYS = `sysdep =M_UNIX -lmalloc =ISC -lmalloc =M_I386 =M_I286 -SEG 256`
! LDFLAGS = $(LDSYS) -lx $(LCRYPT) $(CURSES_LIB)
ECUSHARNAME=ecu3
MANSHARNAME=ecuman3
*** /u4/src/ecu3.02/ecu.h Thu Jan 10 14:04:58 1991
--- ecu.h Tue Jan 22 14:33:39 1991
***************
*** 3,8
wht@n4hgf.Mt-Park.GA.US
------------------------------------------------------------------------*/
/*+:EDITS:*/
/*:01-01-1991-21:36-wht@n4hgf-add GCC implies STDC */
/*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
--- 3,9 -----
wht@n4hgf.Mt-Park.GA.US
------------------------------------------------------------------------*/
/*+:EDITS:*/
+ /*:01-22-1991-14:33-wht@n4hgf-XENIX calloc/memmove fix */
/*:01-01-1991-21:36-wht@n4hgf-add GCC implies STDC */
/*:08-14-1990-20:39-wht@n4hgf-ecu3.00-flush old edit history */
***************
*** 64,69
/* #define ulong unsigned long */
/* #endif */
#define MALLOC_3X
#if defined(MALLOC_3X)
#include <malloc.h>
--- 65,71 -----
/* #define ulong unsigned long */
/* #endif */
+ #if defined(M_UNIX) || defined(ISC)
#define MALLOC_3X
#if defined(MALLOC_3X)
#include <malloc.h>
***************
*** 68,73
#if defined(MALLOC_3X)
#include <malloc.h>
#endif
/* for better source line utilization, frequent use of 'fprintf' and 'stderr'
warrants the following */
--- 70,76 -----
#if defined(MALLOC_3X)
#include <malloc.h>
#endif
+ #endif /* M_UNIX || ISC */
/* for better source line utilization, frequent use of 'fprintf' and 'stderr'
warrants the following */
*** /u4/src/ecu3.02/patchlevel.h Tue Jan 1 23:04:50 1991
--- patchlevel.h Thu Jan 10 14:08:31 1991
***************
*** 1,1
! #define PATCHLEVEL 2
--- 1,1 -----
! #define PATCHLEVEL 3
-----------------------------------------------------------------------
Warren Tucker, March Hare gatech!n4hgf!wht or wht@n4hgf.Mt-Park.GA.US
When bad men combine, the good must associate; else they will fall one
by one, an unpitied sacrifice in a contemptible struggle. -Edmund Burke
exit 0 # Just in case...
--
Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM
Sterling Software, IMD UUCP: uunet!sparky!kent
Phone: (402) 291-8300 FAX: (402) 291-4362
Please send comp.sources.misc-related mail to kent@uunet.uu.net.