From 440f61d54038db80bc6ba9c0d4c6b6071d898617 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Fri, 26 Jan 2018 11:56:41 -0500 Subject: [PATCH] Corrected a number of function returns, mainly to avoid compile- time warnings and errors. Removed the "-lazy" option from the Tcl load command, which is not needed when the stubs libraries are compiled in correctly, and which causes issues on some systems (e.g., Mac OS). Thanks to Matt Guthaus for the patch. --- base/flatten.c | 2 +- base/hash.c | 2 +- base/hash.h | 1 + base/netcmp.c | 10 +++++----- base/netgen.c | 8 ++++---- base/objlist.c | 6 +++--- base/xilinx.c | 1 + defs.mak | 4 ++-- scripts/config.log | 28 ++++++++++++++-------------- scripts/config.status | 2 +- scripts/configure | 3 +-- scripts/configure.in | 1 + scripts/defs.mak | 4 ++-- tcltk/Makefile | 10 +++++----- tcltk/netgen.tcl.in | 9 ++++----- 15 files changed, 46 insertions(+), 45 deletions(-) diff --git a/base/flatten.c b/base/flatten.c index 3859cf0..83c9fea 100644 --- a/base/flatten.c +++ b/base/flatten.c @@ -1417,7 +1417,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2) else tc2 = LookupCellFile(name2, file2); - if (tc1 == NULL || tc2 == NULL) return; + if (tc1 == NULL || tc2 == NULL) return 0; InitializeHashTable(&compdict, OBJHASHSIZE); diff --git a/base/hash.c b/base/hash.c index 96104b3..6fe060c 100644 --- a/base/hash.c +++ b/base/hash.c @@ -309,7 +309,7 @@ struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr, /* destroy a hash table, freeing associated memory */ /*----------------------------------------------------------------------*/ -void *HashKill(struct hashdict *dict) +void HashKill(struct hashdict *dict) { struct hashlist *np, *p; int i; diff --git a/base/hash.h b/base/hash.h index eb0519f..4bd4c3d 100644 --- a/base/hash.h +++ b/base/hash.h @@ -25,6 +25,7 @@ extern struct nlist *RecurseHashTablePointer(struct hashdict *dict, void *pointer); extern void HashDelete(char *name, struct hashdict *dict); extern void HashIntDelete(char *name, int value, struct hashdict *dict); +extern void HashKill(struct hashdict *dict); extern int CountHashTableEntries(struct hashlist *p); diff --git a/base/netcmp.c b/base/netcmp.c index 8038a4b..53fdf18 100644 --- a/base/netcmp.c +++ b/base/netcmp.c @@ -573,7 +573,7 @@ struct FormattedList *FormatBadElementFragment(struct Element *E) elemlist = (struct FormattedList *)MALLOC(sizeof(struct FormattedList)); if (elemlist == NULL) { Fprintf(stdout, "Unable to allocated memory to print element fanout.\n"); - return; + return NULL; } fanout = 0; @@ -582,7 +582,7 @@ struct FormattedList *FormatBadElementFragment(struct Element *E) if (nodes == NULL) { Fprintf(stderr, "Unable to allocate memory to print element fanout.\n"); FREE(elemlist); - return; + return NULL; } elemlist->flist = (struct FanoutList *)CALLOC(fanout, sizeof(struct FanoutList)); @@ -829,14 +829,14 @@ struct FormattedList *FormatBadNodeFragment(struct Node *N) pins = (struct ElementList **)CALLOC(fanout, sizeof(struct ElementList *)); if (pins == NULL) { Fprintf(stdout, "Unable to allocate memory to print node fanout.\n"); - return; + return NULL; } nodelist = (struct FormattedList *)MALLOC(sizeof(struct FormattedList)); if (nodelist == NULL) { Fprintf(stdout, "Unable to allocate memory to print node fanout.\n"); FREE(pins); - return; + return NULL; } nodelist->flist = (struct FanoutList *)CALLOC(fanout, sizeof(struct FanoutList)); nodelist->fanout = fanout; @@ -6054,7 +6054,7 @@ int IgnoreClass(char *name, int file, unsigned char type) if ((file == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) { IgnoreClass(name, Circuit1->file, type); IgnoreClass(name, Circuit2->file, type); - return; + return 0; } newIgnore = (struct IgnoreList *)MALLOC(sizeof(struct IgnoreList)); diff --git a/base/netgen.c b/base/netgen.c index cc8860f..c380ad0 100644 --- a/base/netgen.c +++ b/base/netgen.c @@ -1038,7 +1038,7 @@ struct property *PropertyValue(char *name, int fnum, char *key, if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) { PropertyValue(name, Circuit1->file, key, slop, pdefault); PropertyValue(name, Circuit2->file, key, slop, pdefault); - return; + return NULL; } tc = LookupCellFile(name, fnum); @@ -1073,7 +1073,7 @@ struct property *PropertyDouble(char *name, int fnum, char *key, if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) { PropertyDouble(name, Circuit1->file, key, slop, pdefault); PropertyDouble(name, Circuit2->file, key, slop, pdefault); - return; + return NULL; } tc = LookupCellFile(name, fnum); @@ -1106,7 +1106,7 @@ struct property *PropertyInteger(char *name, int fnum, char *key, if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) { PropertyInteger(name, Circuit1->file, key, slop, pdefault); PropertyInteger(name, Circuit2->file, key, slop, pdefault); - return; + return NULL; } tc = LookupCellFile(name, fnum); @@ -1139,7 +1139,7 @@ struct property *PropertyString(char *name, int fnum, char *key, double dval, if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) { PropertyString(name, Circuit1->file, key, dval, pdefault); PropertyString(name, Circuit2->file, key, dval, pdefault); - return; + return NULL; } tc = LookupCellFile(name, fnum); diff --git a/base/objlist.c b/base/objlist.c index 4e7da44..68ad373 100644 --- a/base/objlist.c +++ b/base/objlist.c @@ -348,7 +348,7 @@ int removeshorted(struct hashlist *p, int file) ptr = (struct nlist *)(p->ptr); - if ((file != -1) && (ptr->file != file)) return; + if ((file != -1) && (ptr->file != file)) return 0; lob = NULL; for (ob = ptr->cell; ob != NULL;) { @@ -412,7 +412,7 @@ int deleteclass(struct hashlist *p, int file) ptr = (struct nlist *)(p->ptr); - if ((file != -1) && (ptr->file != file)) return; + if ((file != -1) && (ptr->file != file)) return 0; lob = NULL; for (ob = ptr->cell; ob != NULL;) { @@ -469,7 +469,7 @@ int renameinstances(struct hashlist *p, int file) ptr = (struct nlist *)(p->ptr); - if ((file != -1) && (ptr->file != file)) return; + if ((file != -1) && (ptr->file != file)) return 0; for (ob = ptr->cell; ob != NULL; ob = ob->next) { if ((ob->type >= FIRSTPIN) && (ob->model.class != NULL)) { diff --git a/base/xilinx.c b/base/xilinx.c index c14e584..b448364 100644 --- a/base/xilinx.c +++ b/base/xilinx.c @@ -132,6 +132,7 @@ char *xilinx_class(model) } return(model); } +void Xilinx(cellname, filename) char *cellname; char *filename; diff --git a/defs.mak b/defs.mak index 1c00c00..dc4bf68 100644 --- a/defs.mak +++ b/defs.mak @@ -66,8 +66,8 @@ CPP = gcc -E -x c CXX = @CXX@ CPPFLAGS = -I. -I${NETGENDIR} -DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DUSE_TCL_STUBS -DUSE_TK_STUBS -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=\"60\" -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 -DFLAGS_NOSTUB = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -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=\"60\" -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 +DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DUSE_TCL_STUBS -DUSE_TK_STUBS -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=\"90\" -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 +DFLAGS_NOSTUB = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -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=\"90\" -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 CFLAGS = -g -m64 -fPIC -fPIC DEPEND_FILE = Depend diff --git a/scripts/config.log b/scripts/config.log index 8038877..3915813 100644 --- a/scripts/config.log +++ b/scripts/config.log @@ -12,9 +12,9 @@ generated by GNU Autoconf 2.69. Invocation command line was hostname = stravinsky uname -m = x86_64 -uname -r = 3.18.3-201.fc21.x86_64 +uname -r = 4.1.13-100.fc21.x86_64 uname -s = Linux -uname -v = #1 SMP Mon Jan 19 15:59:31 UTC 2015 +uname -v = #1 SMP Tue Nov 10 13:13:20 UTC 2015 /usr/bin/uname -p = x86_64 /bin/uname -X = unknown @@ -50,7 +50,7 @@ configure:2584: found /bin/gcc configure:2595: result: gcc configure:2824: checking for C compiler version configure:2833: gcc --version >&5 -gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) +gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6) Copyright (C) 2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -61,9 +61,9 @@ Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper Target: x86_64-redhat-linux -Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux +Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux Thread model: posix -gcc version 4.9.2 20141101 (Red Hat 4.9.2-1) (GCC) +gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) configure:2844: $? = 0 configure:2833: gcc -V >&5 gcc: error: unrecognized command line option '-V' @@ -125,7 +125,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | /* end confdefs.h. */ | #include configure:3384: result: gcc -E @@ -146,7 +146,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | /* end confdefs.h. */ | #include configure:3447: checking for library containing strerror @@ -261,7 +261,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -302,7 +302,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -382,7 +382,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -454,7 +454,7 @@ configure: failed program was: | #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" | #define PACKAGE_URL "" | #define NETGEN_VERSION "1.5" -| #define NETGEN_REVISION "60" +| #define NETGEN_REVISION "90" | #define STDC_HEADERS 1 | #define HAVE_SYS_TYPES_H 1 | #define HAVE_SYS_STAT_H 1 @@ -521,7 +521,7 @@ configure:5949: checking for IceConnectionNumber in -lICE configure:5974: gcc -o conftest -g conftest.c -lICE >&5 configure:5974: $? = 0 configure:5983: result: yes -configure:6705: creating ./config.status +configure:6704: creating ./config.status ## ---------------------- ## ## Running config.status. ## @@ -621,7 +621,7 @@ CC='gcc' CFLAGS='-g -m64 -fPIC' CPP='gcc -E -x c' CPPFLAGS='' -DEFS='-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=\"60\" -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' +DEFS='-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=\"90\" -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' DEPEND_FLAG='-MM' ECHO_C='' ECHO_N='printf' @@ -736,7 +736,7 @@ unused='' #define PACKAGE_BUGREPORT "eda-dev@opencircuitdesign.com" #define PACKAGE_URL "" #define NETGEN_VERSION "1.5" -#define NETGEN_REVISION "60" +#define NETGEN_REVISION "90" #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/scripts/config.status b/scripts/config.status index f6aadf5..61bdda3 100755 --- a/scripts/config.status +++ b/scripts/config.status @@ -659,7 +659,7 @@ S["ECHO_T"]="" S["ECHO_N"]="-n" S["ECHO_C"]="" S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\ -"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"60\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\ +"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"90\\\" -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 -D"\ "SIZEOF_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 -DHA"\ "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1" diff --git a/scripts/configure b/scripts/configure index 1fd90f4..715ebe7 100755 --- a/scripts/configure +++ b/scripts/configure @@ -6081,8 +6081,7 @@ case $target in ;; *darwin*) - $as_echo "#define macosx 1" >>confdefs.h - + $as_echo "#define macosx macos" >> confdefs.h if test "$CPP" = "cc -E" ; then CPPFLAGS="$CPPFLAGS -no-cpp-precomp" fi diff --git a/scripts/configure.in b/scripts/configure.in index a72d2bf..7f1ab08 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -868,6 +868,7 @@ case $target in AC_DEFINE(i386) ;; *darwin*) + $as_echo "#define macosx macos" >> confdefs.h if test "$CPP" = "cc -E" ; then CPPFLAGS="$CPPFLAGS -no-cpp-precomp" fi diff --git a/scripts/defs.mak b/scripts/defs.mak index 1c00c00..dc4bf68 100644 --- a/scripts/defs.mak +++ b/scripts/defs.mak @@ -66,8 +66,8 @@ CPP = gcc -E -x c CXX = @CXX@ CPPFLAGS = -I. -I${NETGENDIR} -DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DUSE_TCL_STUBS -DUSE_TK_STUBS -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=\"60\" -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 -DFLAGS_NOSTUB = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -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=\"60\" -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 +DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DUSE_TCL_STUBS -DUSE_TK_STUBS -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=\"90\" -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 +DFLAGS_NOSTUB = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -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=\"90\" -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 CFLAGS = -g -m64 -fPIC -fPIC DEPEND_FILE = Depend diff --git a/tcltk/Makefile b/tcltk/Makefile index 97e0436..afe9e61 100644 --- a/tcltk/Makefile +++ b/tcltk/Makefile @@ -28,14 +28,14 @@ netgenexec${EXEEXT}: netgenexec.c ${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB} netgen.tcl: netgen.tcl.in - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ - -e /SHDLIB_EXT/s%SHDLIB_EXT%${SHDLIB_EXT}%g \ + sed -e 's%TCL_DIR%${TCLDIR}%g' \ + -e 's%SHDLIB_EXT%${SHDLIB_EXT}%g' \ netgen.tcl.in > netgen.tcl netgen.sh: netgen.sh.in - sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \ - -e /TCLLIB_DIR/s%TCLLIB_DIR%${TCL_LIB_DIR}%g \ - -e /WISH_EXE/s%WISH_EXE%${WISH_EXE}%g \ + sed -e 's%TCL_DIR%${TCLDIR}%g' \ + -e 's%TCLLIB_DIR%${TCL_LIB_DIR}%g' \ + -e 's%WISH_EXE%${WISH_EXE}%g' \ netgen.sh.in > netgen.sh $(DESTDIR)${TCLDIR}/%: % diff --git a/tcltk/netgen.tcl.in b/tcltk/netgen.tcl.in index 851299a..4f449b5 100644 --- a/tcltk/netgen.tcl.in +++ b/tcltk/netgen.tcl.in @@ -20,11 +20,10 @@ foreach i $nlist { } } -if {${tcl_version} >= 8.6} { - load -lazy TCL_DIR/tclnetgenSHDLIB_EXT -} else { - load TCL_DIR/tclnetgenSHDLIB_EXT -} +# -lazy option not needed if stubs libraries are handled correctly +# load -lazy TCL_DIR/tclnetgenSHDLIB_EXT + +load TCL_DIR/tclnetgenSHDLIB_EXT #---------------------------------------------------------------- # Convert LVS list result into a JSON file