Thread View: gnu.utils.bug
1 messages
1 total messages
Started by wbader
Fri, 08 Jan 1993 00:24
gnu make 3.62 and sco unix
Author: wbader
Date: Fri, 08 Jan 1993 00:24
Date: Fri, 08 Jan 1993 00:24
365 lines
11280 bytes
11280 bytes
Here are changes I made to build make 3.62 under sco odt 2.0
(a bundle with sco unix 3.2v4.0).
------------------------------
gdiff +context=3 ../x/make-3.62/Makefile Makefile
*** ../x/make-3.62/Makefile Tue Oct 29 21:04:26 1991
--- Makefile Thu Jan 7 16:13:18 1993
***************
*** 19,26 ****
# Makefile for GNU Make
#
! CFLAGS = $(defines) -g
! LDFLAGS = -g
# Define these for your system as follows:
# -DUSG System V
--- 19,28 ----
# Makefile for GNU Make
#
! #CFLAGS = $(defines) -g
! CFLAGS = $(defines)
! #LDFLAGS = -g
! LDFLAGS =
# Define these for your system as follows:
# -DUSG System V
***************
*** 38,44 ****
# without complaint but produce losing code,
# so beware.
# NeXT 1.0a uses an old version of GCC, which required -D__inline=inline.
! defines =
# Define these for your system as follows:
# -DUMAX Encore UMAX
--- 40,46 ----
# without complaint but produce losing code,
# so beware.
# NeXT 1.0a uses an old version of GCC, which required -D__inline=inline.
! defines = -DUSG -DUSGr3 -D__SCO_WAIT3__ -DHAVE_SYS_WAIT
# Define these for your system as follows:
# -DUMAX Encore UMAX
***************
*** 52,58 ****
# Define:
# -DNLIST_NAME_UNION If `struct nlist' has a n_un member.
# -DNLIST_NAME_ARRAY If `n_name' is an array.
! LOAD_AVG =
# If you don't want archive support, comment these out.
ARCHIVES = arscan.o ar.o
--- 54,60 ----
# Define:
# -DNLIST_NAME_UNION If `struct nlist' has a n_un member.
# -DNLIST_NAME_ARRAY If `n_name' is an array.
! LOAD_AVG = -DNO_LDAV
# If you don't want archive support, comment these out.
ARCHIVES = arscan.o ar.o
***************
*** 63,69 ****
# libPW.a is broken on HP9000s300 and HP9000s400 machines. Use
# alloca.c (below) instead on those machines. SGI Irix needs -lmld
# for nlist.
! LOADLIBES =
# If your system doesn't have alloca, or the one provided is bad,
# get it from the Emacs distribution and define these.
--- 65,71 ----
# libPW.a is broken on HP9000s300 and HP9000s400 machines. Use
# alloca.c (below) instead on those machines. SGI Irix needs -lmld
# for nlist.
! LOADLIBES = -lPW -lsocket -lmalloc -lc_s
# If your system doesn't have alloca, or the one provided is bad,
# get it from the Emacs distribution and define these.
------------------------------
gdiff +context=3 ../x/make-3.62/arscan.c arscan.c
*** ../x/make-3.62/arscan.c Tue Oct 22 21:30:25 1991
--- arscan.c Thu Jan 7 16:11:52 1993
***************
*** 160,166 ****
}
#else
{
! #ifndef M_XENIX
int buf;
#else
unsigned short int buf;
--- 160,166 ----
}
#else
{
! #if defined(M_UNIX) || !defined(M_XENIX)
int buf;
#else
unsigned short int buf;
***************
*** 187,193 ****
sscanf (fl_header.fl_fstmoff, "%12ld", &member_offset);
sscanf (fl_header.fl_lstmoff, "%12ld", &last_member_offset);
#else
! #ifndef M_XENIX
register long int member_offset = sizeof (int);
#else /* Xenix. */
register long int member_offset = sizeof (unsigned short int);
--- 187,193 ----
sscanf (fl_header.fl_fstmoff, "%12ld", &member_offset);
sscanf (fl_header.fl_lstmoff, "%12ld", &last_member_offset);
#else
! #if defined(M_UNIX) || !defined(M_XENIX)
register long int member_offset = sizeof (int);
#else /* Xenix. */
register long int member_offset = sizeof (unsigned short int);
***************
*** 281,287 ****
#endif
}
! #ifndef M_XENIX
sscanf (member_header.ar_mode, "%o", &eltmode);
eltsize = atol (member_header.ar_size);
#else /* Xenix. */
--- 281,287 ----
#endif
}
! #if defined(M_UNIX) || !defined(M_XENIX)
sscanf (member_header.ar_mode, "%o", &eltmode);
eltsize = atol (member_header.ar_size);
#else /* Xenix. */
***************
*** 292,298 ****
fnval =
(*function) (desc, name, member_offset,
member_offset + sizeof (member_header), eltsize,
! #ifndef M_XENIX
atol (member_header.ar_date),
atoi (member_header.ar_uid),
atoi (member_header.ar_gid),
--- 292,298 ----
fnval =
(*function) (desc, name, member_offset,
member_offset + sizeof (member_header), eltsize,
! #if defined(M_XENIX) || !defined(M_UNIX)
atol (member_header.ar_date),
atoi (member_header.ar_uid),
atoi (member_header.ar_gid),
------------------------------
gdiff +context=3 ../x/make-3.62/default.c default.c
*** ../x/make-3.62/default.c Fri Oct 4 17:42:22 1991
--- default.c Thu Jan 7 15:19:08 1993
***************
*** 95,107 ****
"cat $< >$@ \n chmod a+x $@",
".s.o",
! #if !defined(M_XENIX) || defined(__GNUC__)
"$(COMPILE.s) -o $@ $<",
#else /* Xenix. */
"$(COMPILE.s) -o$@ $<",
#endif /* Not Xenix. */
".S.o",
! #if !defined(M_XENIX) || defined(__GNUC__)
"$(COMPILE.S) -o $@ $<",
#else /* Xenix. */
"$(COMPILE.S) -o$@ $<",
--- 95,107 ----
"cat $< >$@ \n chmod a+x $@",
".s.o",
! #if !defined(M_XENIX) || defined(M_UNIX) || defined(__GNUC__)
"$(COMPILE.s) -o $@ $<",
#else /* Xenix. */
"$(COMPILE.s) -o$@ $<",
#endif /* Not Xenix. */
".S.o",
! #if !defined(M_XENIX) || defined(M_UNIX) || defined(__GNUC__)
"$(COMPILE.S) -o $@ $<",
#else /* Xenix. */
"$(COMPILE.S) -o$@ $<",
***************
*** 242,248 ****
"COMPILE.s", "$(AS) $(ASFLAGS) $(TARGET_MACH)",
"LINK.S", "$(CC) $(ASFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_MACH)",
"COMPILE.S", "$(CC) $(ASFLAGS) $(CPPFLAGS) $(TARGET_MACH) -c",
! #if !defined(M_XENIX) || defined(__GNUC__)
"PREPROCESS.S", "$(CC) -E $(CPPFLAGS)",
#else /* Xenix. */
"PREPROCESS.S", "$(CC) -EP $(CPPFLAGS)",
--- 242,248 ----
"COMPILE.s", "$(AS) $(ASFLAGS) $(TARGET_MACH)",
"LINK.S", "$(CC) $(ASFLAGS) $(CPPFLAGS) $(LDFLAGS) $(TARGET_MACH)",
"COMPILE.S", "$(CC) $(ASFLAGS) $(CPPFLAGS) $(TARGET_MACH) -c",
! #if !defined(M_XENIX) || defined(M_UNIX) || defined(__GNUC__)
"PREPROCESS.S", "$(CC) -E $(CPPFLAGS)",
#else /* Xenix. */
"PREPROCESS.S", "$(CC) -EP $(CPPFLAGS)",
***************
*** 252,258 ****
"LINT.c", "$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(TARGET_ARCH)",
#ifndef NO_MINUS_C_MINUS_O
! #if !defined(M_XENIX) || defined(__GNUC__)
"OUTPUT_OPTION", "-o $@",
#else /* Xenix. */
"OUTPUT_OPTION", "-Fo$@",
--- 252,258 ----
"LINT.c", "$(LINT) $(LINTFLAGS) $(CPPFLAGS) $(TARGET_ARCH)",
#ifndef NO_MINUS_C_MINUS_O
! #if !defined(M_XENIX) || defined(M_UNIX) || defined(__GNUC__)
"OUTPUT_OPTION", "-o $@",
#else /* Xenix. */
"OUTPUT_OPTION", "-Fo$@",
------------------------------
gdiff +context=3 ../x/make-3.62/misc.c misc.c
*** ../x/make-3.62/misc.c Mon Oct 7 18:04:20 1991
--- misc.c Thu Jan 7 15:08:06 1993
***************
*** 481,487 ****
}
#endif
! #if !defined(POSIX) && !defined(__GNU_LIBRARY__)
extern int getuid (), getgid (), geteuid (), getegid ();
#ifdef USG
extern int setuid (), setgid ();
--- 481,487 ----
}
#endif
! #if !defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(M_UNIX)
extern int getuid (), getgid (), geteuid (), getegid ();
#ifdef USG
extern int setuid (), setgid ();
------------------------------
gdiff +context=3 ../x/make-3.62/job.c job.c
*** ../x/make-3.62/job.c Thu Oct 24 17:58:33 1991
--- job.c Thu Jan 7 15:07:18 1993
***************
*** 60,66 ****
#define WAIT_NOHANG(status) \
wait3((union wait *) (status), WNOHANG, (struct rusage *) 0)
! #if !defined (wait) && !defined (POSIX)
extern int wait ();
#endif
#endif /* HAVE_SYS_WAIT || !USG */
--- 60,66 ----
#define WAIT_NOHANG(status) \
wait3((union wait *) (status), WNOHANG, (struct rusage *) 0)
! #if !defined (wait) && !defined (POSIX) && !defined(M_UNIX)
extern int wait ();
#endif
#endif /* HAVE_SYS_WAIT || !USG */
***************
*** 113,120 ****
--- 113,122 ----
extern int dup2 ();
extern int execve ();
extern void _exit ();
+ #ifndef M_UNIX
extern int geteuid (), getegid ();
extern int setgid (), getgid ();
+ #endif
#endif /* GNU C library. */
#ifndef USG
------------------------------
gdiff +context=3 ../x/make-3.62/commands.c commands.c
*** ../x/make-3.62/commands.c Tue Oct 8 16:20:29 1991
--- commands.c Thu Jan 7 15:02:08 1993
***************
*** 25,31 ****
extern int remote_kill ();
! #if !defined(POSIX) && !defined(__GNU_LIBRARY__)
extern int getpid ();
#endif
--- 25,31 ----
extern int remote_kill ();
! #if !defined(POSIX) && !defined(__GNU_LIBRARY__) && !defined(M_UNIX)
extern int getpid ();
#endif
------------------------------
gdiff +context=3 ../x/make-3.62/function.c function.c
*** ../x/make-3.62/function.c Mon Oct 21 17:44:24 1991
--- function.c Thu Jan 7 14:21:16 1993
***************
*** 326,332 ****
--- 326,334 ----
case function_shell:
{
+ #ifndef M_UNIX
extern int fork ();
+ #endif
extern int pipe ();
char **argv;
char *error_prefix;
------------------------------
gdiff +context=3 ../x/make-3.62/make.h make.h
*** ../x/make-3.62/make.h Sat Oct 26 17:19:58 1991
--- make.h Thu Jan 7 15:02:08 1993
***************
*** 212,218 ****
#define VFORK_NAME "vfork"
#endif /* USG and don't have vfork. */
! #if defined(__GNU_LIBRARY__) || defined(POSIX)
#include <unistd.h>
--- 212,218 ----
#define VFORK_NAME "vfork"
#endif /* USG and don't have vfork. */
! #if defined(__GNU_LIBRARY__) || defined(POSIX) || defined(M_UNIX)
#include <unistd.h>
***************
*** 243,249 ****
extern char *getwd ();
#endif /* Not USG or POSIX, or maybe GNU C library. */
! #if !defined(__GNU_LIBRARY__) && (!defined(vfork) || !defined(POSIX))
#ifdef POSIX
extern pid_t vfork ();
#else
--- 243,249 ----
extern char *getwd ();
#endif /* Not USG or POSIX, or maybe GNU C library. */
! #if !defined(__GNU_LIBRARY__) && (!defined(vfork) || !defined(POSIX)) && !defined(M_UNIX)
#ifdef POSIX
extern pid_t vfork ();
#else
------------------------------
gdiff +context=3 ../x/make-3.62/glob/glob.c glob/glob.c
*** ../x/make-3.62/glob/glob.c Sat Oct 19 16:39:23 1991
--- glob/glob.c Thu Jan 7 14:34:43 1993
***************
*** 132,137 ****
--- 132,141 ----
#endif /* Not STDC_HEADERS or __GNU_LIBRARY__. */
+ #ifdef M_UNIX
+ #define STDC_STRINGS
+ #endif
+
#ifndef STDC_STRINGS
#define memcpy(d, s, n) bcopy((s), (d), (n))
#define strrchr rindex
Thread Navigation
This is a paginated view of messages in the thread with full content displayed inline.
Messages are displayed in chronological order, with the original post highlighted in green.
Use pagination controls to navigate through all messages in large threads.
Back to All Threads