summaryrefslogtreecommitdiff
path: root/cad/cider/files/patch-ao
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-01-22 08:30:59 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-01-22 08:30:59 +0000
commit000cebd64d68a4e2f7e7e45639e3e3d05e0d1da9 (patch)
tree742d9ca1fbabf278b2a379bbd7f57c0bdcf90547 /cad/cider/files/patch-ao
parent- Pass maintainership to submitter (diff)
- Fix build with gcc 4.1
PR: ports/107134 Submitted by: AMAKAWA Shuhei <sa264@cam.ac.uk> (maintainer)
Diffstat (limited to 'cad/cider/files/patch-ao')
-rw-r--r--cad/cider/files/patch-ao117
1 files changed, 103 insertions, 14 deletions
diff --git a/cad/cider/files/patch-ao b/cad/cider/files/patch-ao
index d27cfa1f636a..2b424e76e4bc 100644
--- a/cad/cider/files/patch-ao
+++ b/cad/cider/files/patch-ao
@@ -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)