diff --git a/base/netcmp.c b/base/netcmp.c index 073b74a..d69ef5b 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -4701,13 +4701,16 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2) if (ob2->model.port == -1) { if (Debug == 0) { - for (m = 0; m < 43; m++) *(ostr + m) = ' '; - for (m = 44; m < 87; m++) *(ostr + m) = ' '; - sprintf(ostr, "(no matching pin)"); - sprintf(ostr + 44, "%s", ob2->name); - for (m = 0; m < 88; m++) - if (*(ostr + m) == '\0') *(ostr + m) = ' '; - Fprintf(stdout, ostr); + // See above for reverse case + if (strcmp(ob2->name, "(no pins)")) { + for (m = 0; m < 43; m++) *(ostr + m) = ' '; + for (m = 44; m < 87; m++) *(ostr + m) = ' '; + sprintf(ostr, "(no matching pin)"); + sprintf(ostr + 44, "%s", ob2->name); + for (m = 0; m < 88; m++) + if (*(ostr + m) == '\0') *(ostr + m) = ' '; + Fprintf(stdout, ostr); + } } else { Fprintf(stderr, "No netlist match for cell %s pin %s\n", diff --git a/install.log b/install.log index d2e8556..466bc16 100644 --- a/install.log +++ b/install.log @@ -80,3 +80,36 @@ rm -f /usr/local/lib/netgen/tcl/netgenexec cp netgenexec /usr/local/lib/netgen/tcl/netgenexec make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5' +make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5' +./scripts/mkdirs /usr/local/bin /usr/local/share/man \ + /usr/local/lib/netgen/tcl +for dir in lib doc tcltk netgen tcltk; do \ + (cd $dir && make install-tcl); done +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib' +make[2]: Nothing to be done for 'install-tcl'. +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc' +../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1 +../scripts/mkdirs /usr/local/lib/netgen/doc +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk' +rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen +cp netgen.sh /usr/local/bin/netgen +(cd /usr/local/bin; chmod 0755 netgen) +rm -f /usr/local/lib/netgen/tcl/netgen.tcl +cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl +rm -f /usr/local/lib/netgen/tcl/netgenexec +cp netgenexec /usr/local/lib/netgen/tcl/netgenexec +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen' +rm -f /usr/local/lib/netgen/tcl/tclnetgen.so +cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk' +rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen +cp netgen.sh /usr/local/bin/netgen +(cd /usr/local/bin; chmod 0755 netgen) +rm -f /usr/local/lib/netgen/tcl/netgenexec +cp netgenexec /usr/local/lib/netgen/tcl/netgenexec +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' +make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5' diff --git a/make.log b/make.log index c0f3b26..7d5b161 100644 --- a/make.log +++ b/make.log @@ -232,3 +232,40 @@ sed -e /TCL_DIR/s%TCL_DIR%/usr/local/lib/netgen/tcl%g \ netgen.sh.in > netgen.sh make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5' +make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5' +--- making modules +for dir in base tcltk; do \ + (cd $dir && make module); done +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/base' +make[2]: Nothing to be done for 'module'. +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/base' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk' +--- compiling tcltk/tclnetgen.o +rm -f tclnetgen.o +gcc -g -m64 -fPIC -fPIC -I../base -I. -I.. -DCAD_DIR=\"/usr/local/lib\" -DTCL_DIR=\"/usr/local/lib/netgen/tcl\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"39\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG -DNETGEN_DATE="\"`date`\"" -c tclnetgen.c +--- linking libtcltk.o +rm -f libtcltk.o +/bin/ld -r tclnetgen.o -o libtcltk.o +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' +--- making Tcl shared-object libraries +for dir in netgen tcltk; do \ + (cd $dir && make tcl-main); done +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen' +--- making netgen Tcl library (tclnetgen.so) +rm -f tclnetgen.so +gcc -g -m64 -fPIC -fPIC -I../base -I. -I.. -o tclnetgen.so -shared -Wl,-soname,tclnetgen.so -Wl,--version-script=../netgen/symbol.map \ + ../base/libbase.o ../tcltk/libtcltk.o -lc -lX11 -lm \ + +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen' +make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk' +gcc -g -m64 -fPIC -fPIC -I../base -I. -I.. -DCAD_DIR=\"/usr/local/lib\" -DTCL_DIR=\"/usr/local/lib/netgen/tcl\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"eda-dev@opencircuitdesign.com\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"39\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG -DNETGEN_DATE="\"`date`\"" netgenexec.c -o netgenexec \ + -lm -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6 +sed -e /TCL_DIR/s%TCL_DIR%/usr/local/lib/netgen/tcl%g \ + -e /SHDLIB_EXT/s%SHDLIB_EXT%.so%g \ + netgen.tcl.in > netgen.tcl +sed -e /TCL_DIR/s%TCL_DIR%/usr/local/lib/netgen/tcl%g \ + -e /TCLLIB_DIR/s%TCLLIB_DIR%/usr/lib%g \ + -e /WISH_EXE/s%WISH_EXE%/usr/bin/wish%g \ + netgen.sh.in > netgen.sh +make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk' +make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5' diff --git a/netgen/tclnetgen.so b/netgen/tclnetgen.so index dfb65c8..f930342 100755 Binary files a/netgen/tclnetgen.so and b/netgen/tclnetgen.so differ