jones@ut-emx.UUCP (William L. Jones) (01/09/90)
The following is a shar file containing the necessary diffs to compile X11R4
on a convex with the cc compiler. It contains the following files:
Imake.tmpl.diff - Defines Macros for convex
Intrisnic.h.diff - Standard XtOffset does not work. Redefined one
that does.
XlibInt.c.diff - Convex defines a qnext macro which collides with
the qnext variable. Undefined the convex qnext
macro in XlibInt.c
Xterm.Imakefile.diff - Convex bcopy does not handle overlaps. Used
the -Dbcopy define to use local written c
version cbcopy.c.
cbcopy.c - cbcopy.c (Put in xterm directory)
convex.cf - config file for convex.
You will have to compile the C programs in R4/mit/extensions/lib/xinput
with the vc compiler. The cc compiler run out of symbols.
It might be possible to compile X11R4 with the vc with a few changes to
the Xaw library. If anyone succeeds in compiling X11R4 with the vc
compiler would they please send me a note on how they did it.
---------------
#!/bin/sh
# shar: Shell Archiver (v1.22)
#
# Run the following text with /bin/sh to create:
# Imake.tmpl.diff
# Intrisnic.h.diff
# XlibInt.c.diff
# Xterm.Imakefile.diff
# cbcopy.c
# convex.cf
#
sed 's/^X//' << 'SHAR_EOF' > Imake.tmpl.diff &&
X*** Imake.tmpl Sat Jan 6 14:57:52 1990
X--- ../../../untouched/r4/mit/config/Imake.tmpl Mon Dec 18 16:01:44 1989
X***************
X*** 72,84
X #define SunArchitecture
X #endif /* sun */
X
X- #ifdef convex
X- #define MacroIncludeFile <convex.cf>
X- #define MacroFile convex.cf
X- #undef convex
X- #define ConvexArchitecture
X- #endif /* convex */
X-
X #ifdef hpux
X #define MacroIncludeFile <hp.cf>
X #define MacroFile hp.cf
X
X--- 72,77 -----
X #define SunArchitecture
X #endif /* sun */
X
X #ifdef hpux
X #define MacroIncludeFile <hp.cf>
X #define MacroFile hp.cf
SHAR_EOF
chmod 0644 Imake.tmpl.diff || echo "restore of Imake.tmpl.diff fails"
sed 's/^X//' << 'SHAR_EOF' > Intrisnic.h.diff &&
X*** Intrinsic.h Sat Jan 6 16:32:47 1990
X--- /common/src/uns/X11R4/untouched/r4/mit/lib/Xt/Intrinsic.h Fri Dec 15 06:35:00 1989
X***************
X*** 1958,1964
X #endif /* !CRAY2 */
X #else /* !CRAY */
X
X- #ifndef convex
X #define XtOffset(p_type,field) \
X ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
X #else
X
X--- 1958,1963 -----
X #endif /* !CRAY2 */
X #else /* !CRAY */
X
X #define XtOffset(p_type,field) \
X ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
X
X***************
X*** 1961,1969
X #ifndef convex
X #define XtOffset(p_type,field) \
X ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
X- #else
X- #define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
X- #endif
X
X #endif /* !CRAY */
X
X
X--- 1960,1965 -----
X
X #define XtOffset(p_type,field) \
X ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
X
X #endif /* !CRAY */
X
SHAR_EOF
chmod 0644 Intrisnic.h.diff || echo "restore of Intrisnic.h.diff fails"
sed 's/^X//' << 'SHAR_EOF' > XlibInt.c.diff &&
X*** XlibInt.c Sat Jan 6 16:45:24 1990
X--- /common/src/uns/X11R4/untouched/r4/mit/lib/X/XlibInt.c Mon Dec 11 22:00:00 1989
X***************
X*** 1522,1530
X register _XQEvent *qelt = _qfree;
X
X while (qelt) {
X- #ifdef convex
X- #undef qnext
X- #endif
X register _XQEvent *qnext = qelt->next;
X Xfree ((char *) qelt);
X qelt = qnext;
X
X--- 1522,1527 -----
X register _XQEvent *qelt = _qfree;
X
X while (qelt) {
X register _XQEvent *qnext = qelt->next;
X Xfree ((char *) qelt);
X qelt = qnext;
SHAR_EOF
chmod 0644 XlibInt.c.diff || echo "restore of XlibInt.c.diff fails"
sed 's/^X//' << 'SHAR_EOF' > Xterm.Imakefile.diff &&
X*** Imakefile Mon Jan 8 16:08:10 1990
X--- /common/src/uns/X11R4/untouched/r4/mit/clients/xterm/Imakefile Fri Dec 15 13:21:08 1989
X***************
X*** 33,39
X PTYLIB = -lpucc
X #endif
X
X! MAIN_DEFINES = -DUTMP -DWTMP $(TTYGROUPDEF) $(PUCCPTYDDEF)
X
X #ifdef ConvexArchitecture
X DEFINES = -Dbcopy=cbcopy
X
X--- 33,39 -----
X PTYLIB = -lpucc
X #endif
X
X! MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF)
X
X SRCS1 = button.c charproc.c cursor.c data.c input.c \
X main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X***************
X*** 35,42
X
X MAIN_DEFINES = -DUTMP -DWTMP $(TTYGROUPDEF) $(PUCCPTYDDEF)
X
X- #ifdef ConvexArchitecture
X- DEFINES = -Dbcopy=cbcopy
X SRCS1 = button.c charproc.c cursor.c data.c input.c \
X main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c cbcopy.c
X
X--- 35,40 -----
X
X MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF)
X
X SRCS1 = button.c charproc.c cursor.c data.c input.c \
X main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
X***************
X*** 39,45
X DEFINES = -Dbcopy=cbcopy
X SRCS1 = button.c charproc.c cursor.c data.c input.c \
X main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X! TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c cbcopy.c
X OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
X screen.o scrollbar.o button.o Tekproc.o misc.o \
X VTPrsTbl.o TekPrsTbl.o data.o menu.o cbcopy.o
X
X--- 37,43 -----
X
X SRCS1 = button.c charproc.c cursor.c data.c input.c \
X main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X! TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
X OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
X screen.o scrollbar.o button.o Tekproc.o misc.o \
X VTPrsTbl.o TekPrsTbl.o data.o menu.o
X***************
X*** 42,56
X TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c cbcopy.c
X OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
X screen.o scrollbar.o button.o Tekproc.o misc.o \
X! VTPrsTbl.o TekPrsTbl.o data.o menu.o cbcopy.o
X! #else
X! SRCS1 = button.c charproc.c cursor.c data.c input.c \
X! main.c menu.c misc.c screen.c scrollbar.c tabs.c \
X! TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
X! OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
X! screen.o scrollbar.o button.o Tekproc.o misc.o \
X! VTPrsTbl.o TekPrsTbl.o data.o menu.o
X! #endif
X SRCS2 = resize.c
X OBJS2 = resize.o
X SRCS = $(SRCS1) $(SRCS2)
X
X--- 40,46 -----
X TekPrsTbl.c Tekproc.c util.c VTPrsTbl.c
X OBJS1 = main.o input.o charproc.o cursor.o util.o tabs.o \
X screen.o scrollbar.o button.o Tekproc.o misc.o \
X! VTPrsTbl.o TekPrsTbl.o data.o menu.o
X SRCS2 = resize.c
X OBJS2 = resize.o
X SRCS = $(SRCS1) $(SRCS2)
SHAR_EOF
chmod 0644 Xterm.Imakefile.diff || echo "restore of Xterm.Imakefile.diff fails"
sed 's/^X//' << 'SHAR_EOF' > cbcopy.c &&
Xcbcopy(src,dst,count)
Xchar *src;
Xchar *dst;
Xint count;
X{
X int n;
X
X if(abs(src - dst) <= count ) {
X if( src < dst ) {
X src += count - 1;
X dst += count - 1;
X while(count--) *dst-- = *src--;
X return 0;
X }
X }
X
X while(count--) *dst++ = *src++;
X return 0;
X}
SHAR_EOF
chmod 0644 cbcopy.c || echo "restore of cbcopy.c fails"
sed 's/^X//' << 'SHAR_EOF' > convex.cf &&
X/*
X * SET VERSION NUMBERS BEFORE MAKING MAKEFILES
X */
X
X#define OSName Convex UNIX V7.1
X#define OSMajorVersion 7
X#define OSMinorVersion 1
X
X#define SystemV NO
X#define HasVoidSignalReturn Yes
X#define BuildServer NO
X#define OptimizedCDebugFlags
X#define ExtensionDefines -DSHAPE -DMULTIBUFFER -DMITMISC
X
SHAR_EOF
chmod 0644 convex.cf || echo "restore of convex.cf fails"
exit 0