Date: Sat, 23 Dec 2006 11:45:11 GMT From: shuhei<sa264@cam.ac.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/107134: fix cad/cider build error with gcc41 Message-ID: <200612231145.kBNBjBNq056596@www.freebsd.org> Resent-Message-ID: <200612231150.kBNBoDaN052904@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107134 >Category: ports >Synopsis: fix cad/cider build error with gcc41 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 23 11:50:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: shuhei >Release: 4.11-STABLE >Organization: >Environment: >Description: At Thu, 14 Dec 2006 21:28:27 -0500, Kris Kennaway wrote: > > Dear Maintainer, > > As you may know, in the near future FreeBSD 7.x will be switching from > the gcc 3.4 compiler to gcc 4.x. Unfortunately your port fails to > build with the new compiler; see the log below or the following url: > > http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.7.2006121307/ > > To ease the disruption to users and to avoid further work later on, > can you please work (with the upstream developers if necessary) on > fixing this error? > > In many cases it requires only simple code changes, and these may > already have been submitted to the developers by other projects > (thesedays many Linux distributions use gcc 4.1, so chances are they > have fixed the error already), or the patches may be found in their > package repositories. > > You should be able to reproduce it yourself simply by installing the > lang/gcc41 port and then setting the variables > > CC=/usr/local/bin/gcc41 > CXX=/usr/local/bin/g++41 > > in your environment (Note: some ports do not respect these variables > currently, but this is another bug that should be fixed). > > Thanks, > Kris >How-To-Repeat: >Fix: diff -uNr /usr/ports/cad/cider/Makefile cider/Makefile --- /usr/ports/cad/cider/Makefile Fri Dec 16 23:49:00 2005 +++ cider/Makefile Fri Dec 22 21:17:11 2006 @@ -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,13 +16,15 @@ 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 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 diff -uNr /usr/ports/cad/cider/files/Makefile.cider cider/files/Makefile.cider --- /usr/ports/cad/cider/files/Makefile.cider Thu Dec 30 06:32:08 1999 +++ cider/files/Makefile.cider Thu Dec 21 00:56:56 2006 @@ -1,5 +1,5 @@ all: - ./util/build FreeBSD + env CC=${CC} ./util/build FreeBSD install: ./util/build FreeBSD install diff -uNr /usr/ports/cad/cider/files/Makefile.spice cider/files/Makefile.spice --- /usr/ports/cad/cider/files/Makefile.spice Thu Dec 30 06:32:08 1999 +++ cider/files/Makefile.spice Thu Dec 21 00:58:36 2006 @@ -1,5 +1,5 @@ all: - ./util/build FreeBSD default + env CC=${CC} ./util/build FreeBSD default install: ./util/build FreeBSD install diff -uNr /usr/ports/cad/cider/files/patch-aa cider/files/patch-aa --- /usr/ports/cad/cider/files/patch-aa Mon Jan 24 14:00:55 2000 +++ cider/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ -*** spice/common/conf/defaults.orig Sat Jan 29 19:15:53 1994 ---- spice/common/conf/defaults Sun Dec 12 14:40:09 1999 -*************** -*** 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 diff -uNr /usr/ports/cad/cider/files/patch-ab cider/files/patch-ab --- /usr/ports/cad/cider/files/patch-ab Mon Jan 24 14:00:55 2000 +++ cider/files/patch-ab Thu Dec 21 23:28:54 2006 @@ -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 **** - - 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= +--- 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 ++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 diff -uNr /usr/ports/cad/cider/files/patch-aj cider/files/patch-aj --- /usr/ports/cad/cider/files/patch-aj Thu Dec 30 06:32:10 1999 +++ cider/files/patch-aj Wed Dec 20 22:43:18 2006 @@ -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) diff -uNr /usr/ports/cad/cider/files/patch-ak cider/files/patch-ak --- /usr/ports/cad/cider/files/patch-ak Thu Dec 30 06:32:10 1999 +++ cider/files/patch-ak Wed Dec 20 23:00:15 2006 @@ -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" \ diff -uNr /usr/ports/cad/cider/files/patch-ao cider/files/patch-ao --- /usr/ports/cad/cider/files/patch-ao Thu Dec 30 06:32:11 1999 +++ cider/files/patch-ao Wed Dec 20 22:58:41 2006 @@ -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) diff -uNr /usr/ports/cad/cider/files/patch-aq cider/files/patch-aq --- /usr/ports/cad/cider/files/patch-aq Thu Dec 30 06:32:12 1999 +++ cider/files/patch-aq Fri Dec 22 21:06:18 2006 @@ -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 */ diff -uNr /usr/ports/cad/cider/files/patch-as cider/files/patch-as --- /usr/ports/cad/cider/files/patch-as Thu Dec 30 06:32:12 1999 +++ cider/files/patch-as Sat Dec 23 19:49:25 2006 @@ -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 */ diff -uNr /usr/ports/cad/cider/files/patch-bb cider/files/patch-bb --- /usr/ports/cad/cider/files/patch-bb Mon Jan 24 14:00:57 2000 +++ cider/files/patch-bb Thu Dec 21 23:30:08 2006 @@ -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 diff -uNr /usr/ports/cad/cider/files/patch-bj cider/files/patch-bj --- /usr/ports/cad/cider/files/patch-bj Thu Dec 30 06:32:14 1999 +++ cider/files/patch-bj Wed Dec 20 22:46:41 2006 @@ -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 diff -uNr /usr/ports/cad/cider/files/patch-bk cider/files/patch-bk --- /usr/ports/cad/cider/files/patch-bk Thu Dec 30 06:32:14 1999 +++ cider/files/patch-bk Wed Dec 20 22:55:10 2006 @@ -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" \ diff -uNr /usr/ports/cad/cider/files/patch-bl cider/files/patch-bl --- /usr/ports/cad/cider/files/patch-bl Thu Dec 30 06:32:14 1999 +++ cider/files/patch-bl Wed Dec 20 22:53:08 2006 @@ -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) diff -uNr /usr/ports/cad/cider/files/patch-cider-common-src-lib-input-meshset.c cider/files/patch-cider-common-src-lib-input-meshset.c --- /usr/ports/cad/cider/files/patch-cider-common-src-lib-input-meshset.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-cider-common-src-lib-input-meshset.c Sat Dec 23 20:02:55 2006 @@ -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 */ diff -uNr /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-graf.c cider/files/patch-spice-common-src-lib-fte-graf.c --- /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-graf.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-spice-common-src-lib-fte-graf.c Fri Dec 22 20:12:33 2006 @@ -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. */ + diff -uNr /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-grid.c cider/files/patch-spice-common-src-lib-fte-grid.c --- /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-grid.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-spice-common-src-lib-fte-grid.c Fri Dec 22 20:13:31 2006 @@ -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( ); diff -uNr /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-x11.c cider/files/patch-spice-common-src-lib-fte-x11.c --- /usr/ports/cad/cider/files/patch-spice-common-src-lib-fte-x11.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-spice-common-src-lib-fte-x11.c Fri Dec 22 20:24:44 2006 @@ -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; diff -uNr /usr/ports/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c cider/files/patch-spice-common-src-lib-hlp-readhelp.c --- /usr/ports/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-spice-common-src-lib-hlp-readhelp.c Fri Dec 22 20:59:07 2006 @@ -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; + diff -uNr /usr/ports/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c --- /usr/ports/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c Thu Jan 1 09:00:00 1970 +++ cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c Fri Dec 22 21:09:09 2006 @@ -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(); >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612231145.kBNBjBNq056596>