sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build with gcc 4.1

Browse source 
PR:		ports/107134
Submitted by:	AMAKAWA Shuhei <sa264@cam.ac.uk> (maintainer)
This commit is contained in:
Martin Wilke 2007-01-22 08:30:59 +00:00
parent 29d5ae53d1
commit 000cebd64d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=182957
19 changed files with 322 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cad/cider/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= cider
PORTVERSION= 1.b1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mita
@ -16,7 +16,7 @@ DISTNAME= cider1b1
MAINTAINER= amakawa@jp.FreeBSD.org
COMMENT= A mixed-level circuit and device simulator (includes SPICE3)
CONFLICTS= spice-*
CONFLICTS= spice-[0-9]*
WRKSRC= ${WRKDIR}/sim
USE_XLIB= yes
MAN1= sconvert.1 nutmeg.1 spice.1 cider.1
@ -24,6 +24,8 @@ MAN3= mfb.3
MAN5= mfbcap.5
MLINKS= spice.1 spice3.1
MAKE_ENV+= CC="${CC}"
pre-patch:
@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt

2
cad/cider/files/Makefile.cider
View file

@ -1,5 +1,5 @@
all:
./util/build FreeBSD
env CC=${CC} ./util/build FreeBSD
install:
./util/build FreeBSD install

2
cad/cider/files/Makefile.spice
View file

@ -1,5 +1,5 @@
all:
./util/build FreeBSD default
env CC=${CC} ./util/build FreeBSD default
install:
./util/build FreeBSD install

27
cad/cider/files/patch-ab
View file

@ -1,19 +1,20 @@
*** spice/common/util/build.orig Sat Jan 29 19:16:26 1994
--- spice/common/util/build Sun Dec 12 14:38:33 1999
***************
*** 96,102 ****
--- spice/common/util/build.orig Sun Jan 30 04:16:26 1994
+++ spice/common/util/build Thu Dec 21 23:27:39 2006
@@ -96,7 +96,7 @@
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
-trap 'rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1' 1 2 3 4 6 7 8 9 10 12 13 14 15
+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=
@@ -171,7 +171,7 @@
echo Begin build on `hostname` for "${SYS_NAME}" on "${BUILD_DATE}":
$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
- | make -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
+ | make -E CC -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
echo Done with build at `date`
else

13
cad/cider/files/patch-aj
View file

@ -1,5 +1,14 @@
--- spice/common/util/skeleton/make_def.bd.orig Thu Feb 24 07:07:01 1994
+++ spice/common/util/skeleton/make_def.bd Sun Dec 26 17:19:32 1999
--- spice/common/util/skeleton/make_def.bd.orig Thu Feb 24 16:07:01 1994
+++ spice/common/util/skeleton/make_def.bd Wed Dec 20 22:41:46 2006
@@ -44,7 +44,7 @@
PRE_PURPOSE = pre_$(PURPOSE)
PURPOSE = all
INCLUDE = -I$(INCLUDE_DIR) -I$(TCGMSG_DIR)/include
-CC = cc
+REAL_CC = $(CC)
SPICE_TUNE = -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
@@ -85,7 +85,7 @@
# LIBRARIES = ckt cp dev fte hlp inp mfb mfbpc misc ni smp sparse
LIBRARIES = dev ckt cp fte hlp inp $(MFBLIB) misc ni $(SPARSELIB)

28
cad/cider/files/patch-ak
View file

@ -1,11 +1,33 @@
--- spice/common/util/skeleton/make_std.bd.orig Sat Jan 29 19:16:16 1994
+++ spice/common/util/skeleton/make_std.bd Sun Dec 26 17:19:39 1999
--- spice/common/util/skeleton/make_std.bd.orig Sun Jan 30 04:16:16 1994
+++ spice/common/util/skeleton/make_std.bd Wed Dec 20 22:59:47 2006
@@ -23,7 +23,7 @@
DIR="$${DIR}"
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
bootstrap: always
-@if test "x$(DIR)" = "xsrc/"; then \
@@ -110,10 +110,10 @@
cfiles="$(CFILES)"; \
for file in $${cfiles}; do \
if test -n "$(INC_SPECIAL)"; then \
- echo "$(CC) /I..\..\include /I..\dev /c $${file}" \
+ echo "$(REAL_CC) /I..\..\include /I..\dev /c $${file}" \
">> ..\..\$(MSC_ERRS)"; \
else \
- echo "$(CC) /I..\..\include /c $${file}" \
+ echo "$(REAL_CC) /I..\..\include /c $${file}" \
">> ..\..\$(MSC_ERRS)"; \
fi; \
done; \
@@ -123,7 +123,7 @@
if test -n "$(MODULE_TARGET)"; then \
cfiles="$(CFILES)"; \
for file in $${cfiles}; do \
- echo "$(CC) /I..\..\..\include /c" $${file} \
+ echo "$(REAL_CC) /I..\..\..\include /c" $${file} \
">> ..\..\..\$(MSC_ERRS)"; \
done; \
echo "lib ..\..\$(LIBRARY)$(NUMBER).lib" \

117
cad/cider/files/patch-ao
View file

@ -1,27 +1,27 @@
--- spice/common/src/bin/makeops.orig Mon Jan 31 02:14:05 1994
+++ spice/common/src/bin/makeops Sun Dec 26 18:11:11 1999
--- spice/common/src/bin/makeops.orig Mon Jan 31 11:14:05 1994
+++ spice/common/src/bin/makeops Wed Dec 20 22:57:35 2006
@@ -39,20 +39,20 @@
mkdir $(SPICE_EXEC_DIR)
spice3.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
mv -f main.o $@
bspice.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH $(SRC_DIR)/main.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH $(SRC_DIR)/main.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH $(SRC_DIR)/main.c $(ASM_HACK)
mv -f main.o $@
cspice.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH -DSPICE2 $(SRC_DIR)/main.c \
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH -DSPICE2 $(SRC_DIR)/main.c \
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH -DSPICE2 $(SRC_DIR)/main.c \
$(ASM_HACK)
mv -f main.o $@
nutmeg.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) -c $(CFLAGS) $(INCLUDE) $(SRC_DIR)/main.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) $(SRC_DIR)/main.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) $(SRC_DIR)/main.c $(ASM_HACK)
mv -f main.o $@
conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
@ -30,7 +30,7 @@
cconf.o: $(OBJ_DIR)/cconf.c
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
bconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
@echo Creating "$@": ; rm -f "$@"
@ -39,7 +39,7 @@
bconf.o: $(OBJ_DIR)/bconf.c
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
cconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
@echo Creating "$@": ; rm -f "$@"
@ -48,15 +48,15 @@
$(TUNEFILE).o: $(TUNEFILE).c
- ${CC} ${CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
+ ${CC} ${REAL_CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
+ ${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
nconf.o: nconf.c
- ${CC} ${CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
+ ${CC} ${REAL_CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
+ ${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
conf.o: conf.c
- ${CC} ${CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
+ ${CC} ${REAL_CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
+ ${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
$(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
@echo "Creating $(TUNEFILE).c"; \
@ -65,16 +65,105 @@
help.o: help.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) $(CFLAGS) $(INTERFACE_OPTS) $(INCX) \
+ $(CC) $(REAL_CFLAGS) $(INTERFACE_OPTS) $(INCX) \
+ $(REAL_CC) $(REAL_CFLAGS) $(INTERFACE_OPTS) $(INCX) \
-c $(INCLUDE) $(SRC_DIR)/help.c $(ASM_HACK)
spiced.o: spiced.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) $(CFLAGS) -c $(INCLUDE) $(SRC_DIR)/spiced.c $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/spiced.c $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/spiced.c $(ASM_HACK)
multidec.o: multidec.c $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) $(CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
LIB = $(OBJLIB_DIR)
@@ -138,45 +138,45 @@
$(LIB)/misc.a $(LIBTCGMSG)
spice3: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
-@rm -f spice3
- $(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS)
+ $(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS)
spice3m: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
-@rm -f spice3m
- $(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
+ $(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
/users/beorn/malloc.a
spice3mp: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
-@rm -f spice3mp
- $(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
+ $(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
/users/beorn/mprof/libc_mp.a
spice3mp2: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
-@rm -f spice3mp
- $(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
+ $(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
/users/beorn/libc_mp.a
LIBB = $(LIB)/fte.a $(LIB)/cp.a $(LIB)/dev.a $(LIB)/ckt.a \
$(LIB)/inp.a $(LIB)/ni.a $(LIB)/$(SPARSELIB).a $(LIB)/misc.a
bspice: bspice.o $(LIBB) bconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f bspice
- $(CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS)
+ $(REAL_CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS)
bspicem: bspice.o $(LIBB) bconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f bspice
- $(CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS) \
+ $(REAL_CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS) \
/users/beorn/malloc.a
LIBC = $(LIB)/fte.a $(LIB)/cp.a $(LIB)/dev.a $(LIB)/ckt.a \
$(LIB)/inp.a $(LIB)/ni.a $(LIB)/$(SPARSELIB).a $(LIB)/misc.a
cspice: cspice.o $(LIBC) cconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f cspice
- $(CC) -o $@ cspice.o cconf.o $(TUNEFILE).o $(LIBC) $(LDFLAGS)
+ $(REAL_CC) -o $@ cspice.o cconf.o $(TUNEFILE).o $(LIBC) $(LDFLAGS)
LIBN = $(LIB)/fte.a $(LIB)/cp.a $(LIB)/hlp.a $(LIB)/mfb.a $(LIB)/misc.a \
$(LIBTCGMSG)
nutmeg: nutmeg.o $(LIBN) nconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f nutmeg
- $(CC) -o $@ nutmeg.o nconf.o $(TUNEFILE).o $(LIBN) $(LIBX) $(LDFLAGS)
+ $(REAL_CC) -o $@ nutmeg.o nconf.o $(TUNEFILE).o $(LIBN) $(LIBX) $(LDFLAGS)
# old LIBSC= $(LIB)/fte.a $(LIB)/cp.a $(LIB)/fte.a $(LIB)/inp.a $(LIB)/misc.a
LIBSC = $(LIB)/misc.a $(LIBTCGMSG)
@@ -186,28 +186,28 @@
$(LIB)/cp/variable.o $(LIB)/cp/var2.o $(LIB)/fte/dimens.o
sconvert: sconvert.o $(SCFILES) $(LIBSC) $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f sconvert
- $(CC) -o $@ sconvert.o $(SCFILES) $(LIBSC) $(LDFLAGS)
+ $(REAL_CC) -o $@ sconvert.o $(SCFILES) $(LIBSC) $(LDFLAGS)
LIBP2M = $(LIB)/cp.a $(LIB)/inp.a $(LIB)/misc.a
proc2mod: proc2mod.o $(LIBP2M) $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f proc2mod
- $(CC) -o $@ proc2mod.o $(LIBP2M) $(LDFLAGS)
+ $(REAL_CC) -o $@ proc2mod.o $(LIBP2M) $(LDFLAGS)
LIBH = $(LIB)/hlp.a $(LIB)/cp.a $(LIB)/misc.a
help: help.o $(LIBH) $(TUNEFILE).o
@-rm -f help
- $(CC) -o $@ help.o $(LIBH) $(LIBX) $(LDFLAGS) $(TUNEFILE).o
+ $(REAL_CC) -o $@ help.o $(LIBH) $(LIBX) $(LDFLAGS) $(TUNEFILE).o
makeidx: makeidx.o $(LIB)/misc.a
@-rm -f makeidx
- $(CC) -o $@ makeidx.o $(LIB)/misc.a
+ $(REAL_CC) -o $@ makeidx.o $(LIB)/misc.a
LIBSD = $(LIB)/misc.a
spiced: spiced.o $(LIBSD) $(TUNEFILE).o
@-rm -f spiced
- $(CC) -o $@ spiced.o $(LIBSD) $(TUNEFILE).o
+ $(REAL_CC) -o $@ spiced.o $(LIBSD) $(TUNEFILE).o
LIBMD = $(LIB)/sparse.a $(LIB)/misc.a
multidec: multidec.o $(LIBMD) $(SYS_CONF)/$(OBJECTIVE)-ld
@-rm -f $@
- $(CC) -o $@ multidec.o $(LIBMD) $(LDFLAGS) $(GETOPTLIB)
+ $(REAL_CC) -o $@ multidec.o $(LIBMD) $(LDFLAGS) $(GETOPTLIB)

15
cad/cider/files/patch-aq
View file

@ -1,5 +1,5 @@
--- spice/common/src/include/misc.h.orig Sat Jan 29 19:14:17 1994
+++ spice/common/src/include/misc.h Sun Dec 26 18:49:39 1999
--- spice/common/src/include/misc.h.orig Sun Jan 30 04:14:17 1994
+++ spice/common/src/include/misc.h Fri Dec 22 21:05:31 2006
@@ -5,6 +5,10 @@
#ifndef MISC_H
#define MISC_H
@ -11,7 +11,14 @@
#define BSIZE_SP 512
#ifdef HAS_EXIT1
@@ -86,7 +90,9 @@
@@ -81,12 +85,16 @@
# define srandom srand
# endif
+/*
extern char *calloc();
extern char *malloc();
+*/
extern char *realloc();
extern char *getenv();
extern int errno;
@ -21,7 +28,7 @@
extern char *getenv();
extern char *getwd();
extern int rand();
@@ -109,12 +115,14 @@
@@ -109,12 +117,14 @@
# endif /* clearerr */
# endif /* HAS_CLEARERR */

17
cad/cider/files/patch-as
View file

@ -1,5 +1,5 @@
--- spice/common/src/include/util.h.orig Sat Jan 29 19:14:24 1994
+++ spice/common/src/include/util.h Sun Dec 26 19:26:14 1999
--- spice/common/src/include/util.h.orig Sun Jan 30 04:14:24 1994
+++ spice/common/src/include/util.h Sat Dec 23 19:48:50 2006
@@ -6,6 +6,10 @@
#ifndef UTIL
#define UTIL
@ -11,7 +11,18 @@
/* #define MALLOC(x) calloc(1,(unsigned)(x)) */
#define MALLOC(x) tmalloc((unsigned)(x))
#define FREE(x) {if (x) {free((char *)(x));(x) = 0;}}
@@ -44,8 +48,10 @@
@@ -18,8 +22,10 @@
#include <stdlib.h>
#endif
#else
+/*
extern char *malloc();
extern char *calloc();
+*/
extern char *realloc();
extern void free();
#endif
@@ -44,8 +50,10 @@
#endif
/* XXX Move these into the above ifdef someday */

2
cad/cider/files/patch-bb
View file

@ -30,7 +30,7 @@
echo Begin build for "${SYS_NAME}" on "${BUILD_DATE}":
$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
! | make ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
! | make -E CC ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
echo Done with build at `date`
else

13
cad/cider/files/patch-bj
View file

@ -1,5 +1,14 @@
--- cider/common/util/skeleton/make_def.bd.orig Sat Mar 12 13:05:44 1994
+++ cider/common/util/skeleton/make_def.bd Sun Dec 26 17:17:16 1999
--- cider/common/util/skeleton/make_def.bd.orig Sat Mar 12 22:05:44 1994
+++ cider/common/util/skeleton/make_def.bd Wed Dec 20 22:46:26 2006
@@ -48,7 +48,7 @@
PRE_PURPOSE = pre_$(PURPOSE)
PURPOSE = all
INCLUDE = -I$(INCLUDE_DIR) -I$(INCLUDE_SPICE_DIR) -I$(TCGMSG_DIR)/include
-CC = cc
+REAL_CC = $(CC)
CIDER_TUNE = -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\" \
-DSCRIPT_DIR=\"$(SCRIPT_DIR)\" -DNEWS_FILE=\"$(NEWS_FILE)\" \
@@ -76,7 +76,7 @@
LIBRARIES = dev input oned twod spiceitf support

28
cad/cider/files/patch-bk
View file

@ -1,11 +1,33 @@
--- cider/common/util/skeleton/make_std.bd.orig Sat Jan 29 19:31:59 1994
+++ cider/common/util/skeleton/make_std.bd Sun Dec 26 17:17:37 1999
--- cider/common/util/skeleton/make_std.bd.orig Sun Jan 30 04:31:59 1994
+++ cider/common/util/skeleton/make_std.bd Wed Dec 20 22:54:18 2006
@@ -23,7 +23,7 @@
DIR="$${DIR}"
.c.o:
- $(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
bootstrap: always
-@if test "x$(DIR)" = "xsrc/"; then \
@@ -110,10 +110,10 @@
cfiles="$(CFILES)"; \
for file in $${cfiles}; do \
if test -n "$(INC_SPECIAL)"; then \
- echo "$(CC) /I..\..\include /I..\dev /c $${file}" \
+ echo "$(REAL_CC) /I..\..\include /I..\dev /c $${file}" \
">> ..\..\$(MSC_ERRS)"; \
else \
- echo "$(CC) /I..\..\include /c $${file}" \
+ echo "$(REAL_CC) /I..\..\include /c $${file}" \
">> ..\..\$(MSC_ERRS)"; \
fi; \
done; \
@@ -123,7 +123,7 @@
if test -n "$(MODULE_TARGET)"; then \
cfiles="$(CFILES)"; \
for file in $${cfiles}; do \
- echo "$(CC) /I..\..\..\include /c" $${file} \
+ echo "$(REAL_CC) /I..\..\..\include /c" $${file} \
">> ..\..\..\$(MSC_ERRS)"; \
done; \
echo "lib ..\..\$(LIBRARY)$(NUMBER).lib" \

19
cad/cider/files/patch-bl
View file

@ -1,20 +1,29 @@
--- cider/common/src/bin/makeops.orig Tue Mar 8 03:39:12 1994
+++ cider/common/src/bin/makeops Sun Dec 26 18:04:08 1999
--- cider/common/src/bin/makeops.orig Tue Mar 8 12:39:12 1994
+++ cider/common/src/bin/makeops Wed Dec 20 22:51:56 2006
@@ -19,14 +19,14 @@
mkdir $(CIDER_EXEC_DIR)
cider.o: main.c $(SYS_CONF)/$(OBJECTIVE)-cc
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
+ $(CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
+ $(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
mv -f main.o $@
conf.o: conf.c
- $(CC) $(CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
$(TUNEFILE).o: $(TUNEFILE).c
- $(CC) $(CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
+ $(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
+ $(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
@echo Creating "$@":
@@ -66,7 +66,7 @@
cider: cider.o conf.o $(TUNEFILE).o $(OBJCDR) $(LIBBEFS) $(LIBCDR) $(LIBAFTS) \
$(SYS_CONF)/$(OBJECTIVE)-ld
-@rm -f cider
- $(CC) -o $@ cider.o conf.o $(TUNEFILE).o $(OBJCDR) \
+ $(REAL_CC) -o $@ cider.o conf.o $(TUNEFILE).o $(OBJCDR) \
$(LIBBEFS) $(LIBCDR) $(LIBAFTS) $(LIBTCGMSG) $(LIBX) $(LDFLAGS)
qcider: qcider.tpl $(SYS_CONF)/$(OBJECTIVE)

17
cad/cider/files/patch-cider-common-src-lib-input-meshset.c Normal file
View file

@ -0,0 +1,17 @@
--- cider/common/src/lib/input/meshset.c.orig Sun Jan 30 04:30:51 1994
+++ cider/common/src/lib/input/meshset.c Sat Dec 23 19:52:47 2006
@@ -36,12 +36,14 @@
double *, int *, int * );
static int oneSideRatio( double, double, double *, int );
static int twoSideRatio( double, double, double, double *, int, int );
+static int MESHspacing( MESHcard *, double *, double *, int *, int *, int * );
#else
static int oneSideSpacing();
static int twoSideSpacing();
static int maxLimSpacing();
static int oneSideRatio();
static int twoSideRatio();
+static int MESHspacing();
#endif
/* END OF HEADER */

12
cad/cider/files/patch-spice-common-src-lib-fte-graf.c Normal file
View file

@ -0,0 +1,12 @@
--- spice/common/src/lib/fte/graf.c.orig Sun Jan 30 03:46:21 1994
+++ spice/common/src/lib/fte/graf.c Fri Dec 22 20:12:25 2006
@@ -49,6 +49,9 @@
#define MAXTICS 100
double *readtics();
+static int drawlegend();
+static int gr_resize_internal();
+
#define XFACTOR 2 /* How much to expand the X scale during iplot. */
#define YFACTOR 1.5 /* How much to expand the Y scale during iplot. */

12
cad/cider/files/patch-spice-common-src-lib-fte-grid.c Normal file
View file

@ -0,0 +1,12 @@
--- spice/common/src/lib/fte/grid.c.orig Sun Jan 30 03:47:59 1994
+++ spice/common/src/lib/fte/grid.c Fri Dec 22 20:11:21 2006
@@ -19,6 +19,9 @@
#define RAD_TO_DEG (180.0 / M_PI)
#define LABEL_CHARS 20
+static int drawlingrid();
+static int drawloggrid();
+
static double *lingrid(), *loggrid();
static void polargrid(), smithgrid();
static void drawpolargrid( );

13
cad/cider/files/patch-spice-common-src-lib-fte-x11.c Normal file
View file

@ -0,0 +1,13 @@
--- spice/common/src/lib/fte/x11.c.orig Sun Jan 30 03:48:34 1994
+++ spice/common/src/lib/fte/x11.c Fri Dec 22 20:24:00 2006
@@ -61,6 +61,10 @@
#define DEVDEP(g) (*((X11devdep *) (g)->devdep))
+static int initlinestyles();
+static int initcolors();
+static int X_ScreentoData();
+
static void linear_arc( );
static Display *display;
static GC xorgc;

13
cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c Normal file
View file

@ -0,0 +1,13 @@
--- spice/common/src/lib/hlp/readhelp.c.orig Sun Jan 30 03:44:53 1994
+++ spice/common/src/lib/hlp/readhelp.c Fri Dec 22 20:58:15 2006
@@ -41,8 +41,8 @@
static char *getsubject();
static toplink *getsubtoplink();
-extern void sortlist(), tlfree();
-extern int sortcmp();
+static void sortlist(), tlfree();
+static int sortcmp();
static topic *alltopics = NULL;

14
cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c Normal file
View file

@ -0,0 +1,14 @@
--- spice/common/src/lib/mfb/mfbcaps.c.orig Sun Jan 30 04:07:32 1994
+++ spice/common/src/lib/mfb/mfbcaps.c Fri Dec 22 21:08:10 2006
@@ -43,9 +43,9 @@
FILE *POpen();
char *strcpy();
-char *MFBSkip();
+static char *MFBSkip();
char *MFBGetStr();
-char *MFBCapDecod();
+static char *MFBCapDecod();
int MFBGetNum();
int MFBGetFlag();
int MFBGetEnt();