home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
The World of Computer Software
/
World_Of_Computer_Software-02-385-Vol-1of3.iso
/
x
/
x11r5pat.zip
/
patchfile.sola
< prev
next >
Wrap
Text File
|
1992-09-10
|
13KB
|
466 lines
*** mit/config/sv4Lib.rules.orig Fri Jul 19 21:39:37 1991
--- mit/config/sv4Lib.rules Wed Jul 29 11:50:21 1992
***************
*** 53,63 ****
--- 53,79 ----
* the library gone for long periods.
*/
#ifndef SharedLibraryTarget
+ #if defined(SunArchitecture) && defined(SVR4)
#define SharedLibraryTarget(libname,rev,solist,down,up) @@\
AllTarget(Concat(lib,libname.so.rev)) @@\
@@\
Concat(lib,libname.so.rev): solist @@\
$(RM) $@~ @@\
+ (cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\
+ $(RM) $@ @@\
+ $(MV) $@~ $@ @@\
+ $(RM) Concat(lib,libname.so) @@\
+ $(LN) $@ Concat(lib,libname.so) @@\
+ @@\
+ clean:: @@\
+ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+
+ #else
+ #define SharedLibraryTarget(libname,rev,solist,down,up) @@\
+ AllTarget(Concat(lib,libname.so.rev)) @@\
+ @@\
+ Concat(lib,libname.so.rev): solist @@\
+ $(RM) $@~ @@\
(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist) @@\
$(RM) $@ @@\
$(MV) $@~ $@ @@\
***************
*** 66,71 ****
--- 82,88 ----
@@\
clean:: @@\
$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
+ #endif /* Sun & SVR4 */
#endif /* SharedLibraryTarget */
*** mit/config/Imake.rules.orig Thu Aug 22 23:04:24 1991
--- mit/config/Imake.rules Wed Jul 29 13:46:18 1992
***************
*** 211,216 ****
--- 211,236 ----
#ifndef SetUIDProgramTarget
+ #if defined(SunArchitecture) && defined(SystemV4)
+ #ifdef ProjectRoot
+ #define SetUIDProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\
+ program: objects deplibs @@\
+ RemoveTargetProgram($@) @@\
+ LD_RUN_PATH=ProjectRoot/lib:/usr/ucblib; export LD_RUN_PATH; $(CC) -o $@ objects $(LDOPTIONS) locallibs $(LDLIBS) syslibs $(EXTRA_LOAD_FLAGS) @@\
+ @@\
+ clean:: @@\
+ $(RM) program
+ #else /* ProjectRoot */
+ #define SetUIDProgramTarget(program,objects,deplibs,locallibs,syslibs) @@\
+ program: objects deplibs @@\
+ RemoveTargetProgram($@) @@\
+ LD_RUN_PATH=/usr/ucblib; export LD_RUN_PATH; $(CC) -o $@ objects $(LDOPTIONS) locallibs $(LDLIBS) syslibs $(EXTRA_LOAD_FLAGS) @@\
+ @@\
+ clean:: @@\
+ $(RM) program
+ #endif /* ProjectRoot */
+ #endif
+ #else
#define SetUIDProgramTarget NormalProgramTarget
#endif
*** mit/lib/oldX/Imakefile.orig Wed Sep 25 15:10:58 1991
--- mit/lib/oldX/Imakefile Wed Jul 29 11:43:18 1992
***************
*** 9,14 ****
--- 9,18 ----
REQUIREDLIBS = $(XLIBSRC)/libX11.a
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
#if Malloc0ReturnsNull
DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
*** mit/lib/X/Imakefile.orig Tue Dec 17 09:16:24 1991
--- mit/lib/X/Imakefile Wed Jul 29 11:59:27 1992
***************
*** 9,14 ****
--- 9,18 ----
#define MotifBC NO
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
#ifndef BuildXimp
#define BuildXimp NO
#endif
*** mit/lib/Xt/Imakefile.orig Wed Sep 25 15:10:58 1991
--- mit/lib/Xt/Imakefile Wed Jul 29 13:16:53 1992
***************
*** 13,18 ****
--- 13,22 ----
REQUIREDLIBS = $(XLIBSRC)/libX11.a
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
/* config options */
XFILESEARCHPATHDEFAULT = XFileSearchPathDefault
*** mit/lib/Xaw/Imakefile.orig Wed Sep 25 15:10:57 1991
--- mit/lib/Xaw/Imakefile Wed Jul 29 14:53:09 1992
***************
*** 9,14 ****
--- 9,18 ----
REQUIREDLIBS = $(XMUSRC)/libXmu.a $(EXTENSIONSRC)/lib/libXext.a $(TOOLKITSRC)/libXt.a $(XLIBSRC)/libX11.a
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
INSTALLFLAGS = $(INSTINCFLAGS)
LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
*** mit/extensions/lib/Imakefile.orig Tue Jul 23 04:57:23 1991
--- mit/extensions/lib/Imakefile Wed Jul 29 12:01:07 1992
***************
*** 9,14 ****
--- 9,18 ----
REQUIREDLIBS = $(XLIBSRC)/libX11.a
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
#if BuildXInputLib || BuildPexClients
#define IHaveSubdirs
#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
*** mit/extensions/lib/xinput/Imakefile.orig Wed Jul 24 21:39:44 1991
--- mit/extensions/lib/xinput/Imakefile Wed Jul 29 11:56:38 1992
***************
*** 13,18 ****
--- 13,22 ----
REQUIREDLIBS = $(EXTENSIONSRC)/lib/libXext.a $(XLIBSRC)/libX11.a
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ REQUIREDLIBS= -lc
+ #endif
+
#if Malloc0ReturnsNull
DEFINES = -DMALLOC_0_RETURNS_NULL
#endif
*** mit/clients/xterm/Imakefile.orig Fri Mar 20 15:22:43 1992
--- mit/clients/xterm/Imakefile Wed Jul 29 14:03:00 1992
***************
*** 70,76 ****
--- 70,85 ----
#endif
#if InstallXtermSetUID && defined(SunArchitecture) && HasSharedLibraries
+ #if defined(SystemV4)
#if AlternateUsrLibDir
+ DO_LD_RUN= "LD_RUN_PATH=$(DESTDIR)$(USRLIBDIR):/usr/ucblib; export LD_RUN_PATH; "
+ #else
+ DO_LD_RUN= "LD_RUN_PATH=/usr/ucblib; export LD_RUN_PATH; "
+ #endif /* AlternateUsrLibDir */
+ #else
+ DO_LD_RUN=
+ #endif
+ #if AlternateUsrLibDir
#if OSMajorVersion > 4 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
LDOVERRIDE = -L$(DESTDIR)$(USRLIBDIR)
#else
***************
*** 85,91 ****
install:: xterm
MakeDir($(DESTDIR)$(BINDIR))
$(RM) xterm.inst
! $(CC) -o xterm.inst $(OBJS1) $(LDOPTIONS) $(LDOVERRIDE) -lXaw -lXmu -lXt -lXext -lX11 $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB) $(EXTRA_LOAD_FLAGS)
$(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) xterm.inst $(DESTDIR)$(BINDIR)/xterm
$(RM) xterm.inst
#else
--- 94,100 ----
install:: xterm
MakeDir($(DESTDIR)$(BINDIR))
$(RM) xterm.inst
! DO_LD_RUN $(CC) -o xterm.inst $(OBJS1) $(LDOPTIONS) $(LDOVERRIDE) -lXaw -lXmu -lXt -lXext -lX11 $(LDRESUME) $(LDLIBS) $(TERMCAPLIB) $(PTYLIB) $(EXTRA_LOAD_FLAGS)
$(INSTALL) -c $(INSTPGMFLAGS) $(INSTUIDFLAGS) xterm.inst $(DESTDIR)$(BINDIR)/xterm
$(RM) xterm.inst
#else
*** mit/clients/xload/Imakefile.orig Wed Jul 17 06:46:31 1991
--- mit/clients/xload/Imakefile Wed Jul 29 13:53:46 1992
***************
*** 21,27 ****
--- 21,31 ----
DEFINES = -DOSMAJORVERSION=$(OSMAJORVERSION) -DOSMINORVERSION=$(OSMINORVERSION)
AllTarget(xload)
+ #if defined(SunArchitecture) && defined(SystemV4)
+ SetUIDProgramTarget(xload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
+ #else
NormalProgramTarget(xload,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),NullParameter)
+ #endif
InstallProgramWithFlags(xload,$(BINDIR),$(INSTKMEMFLAGS))
InstallManPage(xload,$(MANDIR))
*** mit/clients/xconsole/Imakefile.orig Wed Jul 17 05:07:12 1991
--- mit/clients/xconsole/Imakefile Wed Jul 29 16:15:45 1992
***************
*** 5,10 ****
--- 5,30 ----
DEPLIBS = XawClientDepLibs
LOCAL_LIBRARIES = XawClientLibs
+ #if defined(SunArchitecture) && defined(SystemV4)
+ SetUIDProgramTarget(xconsole,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),)
+
+ AllTarget(xconsole)
+
+ SaberProgramTarget(program,$(SRCS),$(OBJS),$(LOCAL_LIBRARIES),NullParameter)
+
+ InstallManPage(program,$(MANDIR))
+ DependTarget()
+ LintTarget()
+
+ clean::
+ $(RM) xconsole
+
+ InstallProgramWithFlags($(PROGRAMS),$(BINDIR),$(INSTUIDFLAGS))
+ #else
ComplexProgramTarget(xconsole)
+
+ InstallProgramWithFlags($(PROGRAMS),$(BINDIR),NullParameter)
+ #endif
+
InstallAppDefaults(XConsole)
*** mit/server/ddx/sun/sunInit.c.orig Tue May 5 09:10:25 1992
--- mit/server/ddx/sun/sunInit.c Thu Jul 30 10:06:03 1992
***************
*** 228,235 ****
--- 228,240 ----
*/
if (nonBlockConsole) {
if (!setup_on_exit) {
+ #ifdef SVR4
+ if (atexit(sunNonBlockConsoleOff))
+ ErrorF("InitOutput: can't register NBIO exit handler\n");
+ #else
if (on_exit(sunNonBlockConsoleOff, (char *)0))
ErrorF("InitOutput: can't register NBIO exit handler\n");
+ #endif
setup_on_exit = 1;
}
i = fcntl(2, F_GETFL, 0);
*** mit/fonts/lib/font/fontfile/Imakefile.orig Tue Jul 23 04:21:54 1991
--- mit/fonts/lib/font/fontfile/Imakefile Thu Jul 30 10:04:21 1992
***************
*** 6,19 ****
#ifdef FontFormatDefines
FORMAT_DEFS = FontFormatDefines
#endif
SRCS = dirfile.c fontdir.c fontfile.c fontscale.c \
! fontutil.c defaults.c bitsource.c renderers.c
OBJS = dirfile.o fontdir.o fontfile.o fontscale.o \
! fontutil.o defaults.o bitsource.o renderers.o
SubdirLibraryRule($(OBJS))
NormalLibraryObjectRule()
NormalLintTarget($(SRCS))
DependTarget()
--- 6,31 ----
#ifdef FontFormatDefines
FORMAT_DEFS = FontFormatDefines
#endif
+ #if defined(SunArchitecture) && defined(SystemV4)
+ FONTUTIL= font_util
+ #else
+ FONTUTIL= fontutil
+ #endif
+
SRCS = dirfile.c fontdir.c fontfile.c fontscale.c \
! $(FONTUTIL).c defaults.c bitsource.c renderers.c
OBJS = dirfile.o fontdir.o fontfile.o fontscale.o \
! $(FONTUTIL).o defaults.o bitsource.o renderers.o
SubdirLibraryRule($(OBJS))
NormalLibraryObjectRule()
NormalLintTarget($(SRCS))
+
+ #if defined(SunArchitecture) && defined(SystemV4)
+ $(FONTUTIL).c: fontutil.c
+ -rm -f $(FONTUTIL).c
+ ln -s fontutil.c $(FONTUTIL).c
+ #endif
DependTarget()
*** mit/server/ddx/cfb/stipsparc.s.orig Wed Jun 12 23:03:31 1991
--- mit/server/ddx/cfb/stipsparc.s Thu Jul 30 10:21:57 1992
***************
*** 81,88 ****
--- 81,96 ----
#define ForEachBits LY4
#define NextBits LY5
+ #ifdef SVR4
#ifdef TETEXT
+ #define _stipplestack stipplestackte
+ #else
+ #define _stipplestack stipplestack
+ #endif
+ #else
+ #ifdef TETEXT
#define _stipplestack _stipplestackte
+ #endif
#endif
.seg "text"
*** mit/server/ddx/sun/sunMouse.c.orig Mon Nov 18 15:44:51 1991
--- mit/server/ddx/sun/sunMouse.c Thu Jul 30 12:27:16 1992
***************
*** 48,53 ****
--- 48,57 ----
static char sccsid[] = "%W %G Copyright 1987 Sun Micro";
#endif
+ #ifdef SVR4
+ #define sigmask(m) (1 <<((m)-1))
+ #endif
+
#define NEED_EVENTS
#include "sun.h"
#include "mipointer.h"
***************
*** 129,136 ****
Error ("Opening /dev/mouse");
return (!Success);
}
if (fcntl (fd, F_SETFL, (FNDELAY|FASYNC)) < 0
! || fcntl(fd, F_SETOWN, getpid()) < 0) {
perror("sunMouseProc");
ErrorF("Can't set up mouse on fd %d\n", fd);
}
--- 133,145 ----
Error ("Opening /dev/mouse");
return (!Success);
}
+ #ifdef SVR4
+ if (fcntl (fd, F_SETFL, (FNDELAY|FASYNC)) < 0)
+ #else
if (fcntl (fd, F_SETFL, (FNDELAY|FASYNC)) < 0
! || fcntl(fd, F_SETOWN, getpid()) < 0)
! #endif
! {
perror("sunMouseProc");
ErrorF("Can't set up mouse on fd %d\n", fd);
}
*** mit/server/os/connection.c.orig Wed Sep 18 08:48:51 1991
--- mit/server/os/connection.c Thu Jul 30 12:11:07 1992
***************
*** 71,76 ****
--- 71,86 ----
# endif
#endif
+ #if defined(sun) && defined(SVR4)
+ #include <sys/time.h>
+ #include <sys/resource.h>
+
+ /* According to setsockopt(3N), SO_DONTLINGER is not supported, but SO_LINGER is */
+ #if defined(TCPCONN) && defined(SO_DONTLINGER)
+ #undef SO_DONTLINGER
+ #endif
+ #endif
+
#ifdef UNIXCONN
/*
* sites should be careful to have separate /tmp directories for diskless nodes
***************
*** 362,367 ****
--- 372,380 ----
CreateWellKnownSockets()
{
int request, i;
+ #if defined(SVR4) && defined(sun)
+ struct rlimit rl;
+ #endif
CLEARBITS(AllSockets);
CLEARBITS(AllClients);
***************
*** 370,380 ****
for (i=0; i<MAXSOCKS; i++) ConnectionTranslation[i] = 0;
! #if defined(hpux) || defined(SVR4)
lastfdesc = _NFILE - 1;
#else
lastfdesc = getdtablesize() - 1;
! #endif /* hpux */
if (lastfdesc > MAXSOCKS)
{
--- 383,400 ----
for (i=0; i<MAXSOCKS; i++) ConnectionTranslation[i] = 0;
! #ifdef SVR4
! #if defined(hpux)
lastfdesc = _NFILE - 1;
+ #elif defined(sun)
+ getrlimit(RLIMIT_NOFILE, &rl);
+ lastfdesc = rl.rlim_cur;
#else
lastfdesc = getdtablesize() - 1;
! #endif
! #else
! lastfdesc = getdtablesize() - 1;
! #endif /* SVR4 */
if (lastfdesc > MAXSOCKS)
{
*** xmag.c.orig Wed Sep 18 08:48:47 1991
--- xmag.c Tue Aug 11 16:37:32 1992
***************
*** 888,894 ****
! static Widget pane1, pane2, pane3, cclose, replace, new, select, paste, label;
/*
* PopupNewScale() -- Create and popup a new scale composite.
--- 888,894 ----
! static Widget pane1, pane2, pane3, cclose, replace, new, paste, label;
/*
* PopupNewScale() -- Create and popup a new scale composite.
***************
*** 897,902 ****
--- 897,903 ----
PopupNewScale(data)
hlPtr data;
{
+ Widget select;
Arg warg;
data->scaleShell =