1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
*** conf/defaults.orig Thu Jul 29 16:33:56 1993
--- conf/defaults Sat Jun 6 23:40:14 1998
***************
*** 65,71 ****
# the following definition:
# SYS_DIR = $(DIST_DIR)
! SYS_DIR = $(TOP1)/$(SYSTEM)
# OBJ_TOP is the directory in which intermidiate files reside
# These are ".o" files, synthesized ".c" files, ".a" files,
--- 65,71 ----
# the following definition:
# SYS_DIR = $(DIST_DIR)
! SYS_DIR = $(TOP0)/$(SYSTEM)
# OBJ_TOP is the directory in which intermidiate files reside
# These are ".o" files, synthesized ".c" files, ".a" files,
***************
*** 105,116 ****
# identified as and SYSTEM is the name of the per-system definitions
# file listed on the "build" command line.
! SPICE_DIR = $(TOP1)/$(SYSTEM)
! SPICE_LIB_DIR = $(SPICE_DIR)/lib
SPICE_EXEC_DIR = $(SPICE_DIR)/bin
S_SPICE_DIR = $(SPICE_DIR)
! S_SPICE_LIB_DIR = $(S_SPICE_DIR)/lib
S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
# INSTALL_DIRS lists the directories that need to be created before
--- 105,116 ----
# identified as and SYSTEM is the name of the per-system definitions
# file listed on the "build" command line.
! SPICE_DIR = ${PREFIX}
! SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3
SPICE_EXEC_DIR = $(SPICE_DIR)/bin
S_SPICE_DIR = $(SPICE_DIR)
! S_SPICE_LIB_DIR = $(S_SPICE_DIR)/share/spice3
S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
# INSTALL_DIRS lists the directories that need to be created before
***************
*** 129,139 ****
# an extra definition to work around the same strange bug. See either
# file "conf/vax" or "conf/gcc".
! CC = cc
# CC_OPT: Default compile options (optimization/debug level, other)
! CC_OPT = -O
# CC_OPT_SAFE: Special compile options to override CC_OPT for code
# which typically causes problems for most compilers (bsim1 and bsim2).
--- 129,139 ----
# an extra definition to work around the same strange bug. See either
# file "conf/vax" or "conf/gcc".
! CC = gcc
# CC_OPT: Default compile options (optimization/debug level, other)
! CC_OPT = -O2 -pipe
# CC_OPT_SAFE: Special compile options to override CC_OPT for code
# which typically causes problems for most compilers (bsim1 and bsim2).
***************
*** 203,209 ****
# X_DIR indicates the top of the X11 lib/include hierarchy; it is only
# a convenience that is used in the following definitions.
! X_DIR = /usr
# INCX lists the X include directories. This may be different between
# MIT X11r5, X11r4, and your vendor's version of X11, though listing
--- 203,209 ----
# X_DIR indicates the top of the X11 lib/include hierarchy; it is only
# a convenience that is used in the following definitions.
! X_DIR = ${X11BASE}
# INCX lists the X include directories. This may be different between
# MIT X11r5, X11r4, and your vendor's version of X11, though listing
*** util/build.orig Sun Mar 31 10:56:09 1996
--- util/build Sun Mar 31 10:57:21 1996
***************
*** 96,102 ****
TMP_LEADER="${TMP_DIR}/buildl$$"
TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15
echo > "${TMP_TRAILER}"
BAD=false
DEBUG=
--- 96,102 ----
TMP_LEADER="${TMP_DIR}/buildl$$"
TMP_TRAILER="${TMP_DIR}/buildt$$"
! trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 10 12 13 14 15
echo > "${TMP_TRAILER}"
BAD=false
DEBUG=
*** src/lib/fte/resource.c.orig Sun Mar 31 10:59:57 1996
--- src/lib/fte/resource.c Sun Mar 31 11:00:57 1996
***************
*** 369,375 ****
--- 369,377 ----
long x;
SIGNAL_TYPE (*orig_signal)( );
+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
if (getenv("SPICE_NO_DATASEG_CHECK"))
+ #endif
return 0;
low = 0;
*** src/include/misc.h.orig Thu Dec 1 09:17:02 1994
--- src/include/misc.h Sun Mar 31 12:32:58 1996
***************
*** 86,92 ****
--- 86,94 ----
extern char *realloc();
extern char *getenv();
extern int errno;
+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
extern char *sys_errlist[];
+ #endif
extern char *getenv();
extern char *getwd();
extern int rand();
***************
*** 111,122 ****
--- 111,124 ----
# endif /* clearerr */
# endif /* HAS_CLEARERR */
+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
# ifndef bzero
extern int bzero();
# endif
# ifndef bcopy
extern void bcopy();
# endif
+ #endif /* defined(__FreeBSD__) || defined(__NetBSD__) */
# ifndef index
# ifdef HAS_INDEX
*** src/include/os_bsd.h.orig Sat Apr 24 18:09:46 1993
--- src/include/os_bsd.h Tue Jun 2 22:28:04 1998
***************
*** 8,19 ****
#include "os_unix.h"
#define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
- #define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
#define HAS_FTIME /* ftime( ), <times.h> */
#define HAS_TERMCAP /* tgetxxx( ) */
#define HAS_VFORK /* BSD-ism, should not be necessary */
- #define HAS_INDEX /* index( ) instead of strchr( ) */
#define HAS_BCOPY /* bcopy( ), bzero( ) */
#define HAS_BSDRANDOM /* srandom( ) and random( ) */
#define HAS_BSDTTY /* <sgtty.h> */
--- 8,23 ----
#include "os_unix.h"
+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
#define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */
#define HAS_FTIME /* ftime( ), <times.h> */
+ #define HAS_INDEX /* index( ) instead of strchr( ) */
+ #define HAS_STRINGS /* use <strings.h> instead of <string.h> */
+ #endif
+
+ #define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */
#define HAS_TERMCAP /* tgetxxx( ) */
#define HAS_VFORK /* BSD-ism, should not be necessary */
#define HAS_BCOPY /* bcopy( ), bzero( ) */
#define HAS_BSDRANDOM /* srandom( ) and random( ) */
#define HAS_BSDTTY /* <sgtty.h> */
***************
*** 22,25 ****
#define HAS_BSDRLIMIT /* getrlimit( ) */
#define HAS_DUP2
#define HAS_GETWD /* getwd(buf) */
! #define HAS_STRINGS /* use <strings.h> instead of <string.h> */
--- 26,35 ----
#define HAS_BSDRLIMIT /* getrlimit( ) */
#define HAS_DUP2
#define HAS_GETWD /* getwd(buf) */
!
! #if defined(__FreeBSD__) || defined(__NetBSD__)
! #define HAS_BSDSOCKETS /* <net/inet.h>, socket( ), etc. */
! #define HAS_BSDTIME /* gettimeofday( ) return time */
! #define HAS_FLOAT_H /* float.h */
! #define HAS_STRCHR /* strchr( ) instead of index( ) */
! #endif
|
