diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-18 19:42:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-06-18 19:42:21 (GMT) |
| commit | 24fa6f0937702e39da99ae5527e455fff10f386b (patch) | |
| tree | 80ed40a1df200bb156b85f96f33d23943d645f08 | |
| parent | 93570f80acc26b720d1e7535aa3752f8d3f47a45 (diff) | |
| parent | d825807d4612ff87419068d3f4860f394ddbbf74 (diff) | |
| download | tcl-24fa6f0937702e39da99ae5527e455fff10f386b.zip tcl-24fa6f0937702e39da99ae5527e455fff10f386b.tar.gz tcl-24fa6f0937702e39da99ae5527e455fff10f386b.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclZipfs.c | 10 | ||||
| -rw-r--r-- | unix/Makefile.in | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index e43c52e..a5b1413 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -32,6 +32,10 @@ #define TBLS 1 #endif +#if !defined(NO_DLFCN_H) +#include <dlfcn.h> +#endif + #ifdef HAVE_ZLIB #include "zlib.h" #include "crypt.h" @@ -3907,6 +3911,12 @@ TclZipfs_TclLibrary(void) if (ZipfsAppHookFindTclInit(dllName) == TCL_OK) { return Tcl_NewStringObj(zipfs_literal_tcl_library, -1); } +#elif !defined(NO_DLFCN_H) + Dl_info dlinfo; + if (dladdr(TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL) + && (ZipfsAppHookFindTclInit(dlinfo.dli_fname) == TCL_OK)) { + return Tcl_NewStringObj(zipfs_literal_tcl_library, -1); + } #else if (ZipfsAppHookFindTclInit(CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) { return Tcl_NewStringObj(zipfs_literal_tcl_library, -1); diff --git a/unix/Makefile.in b/unix/Makefile.in index 24c49b5..4e5a9af 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1524,7 +1524,7 @@ tclZlib.o: $(GENERIC_DIR)/tclZlib.c $(CC) -c $(CC_SWITCHES) $(ZLIB_INCLUDE) $(GENERIC_DIR)/tclZlib.c tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c - $(CC) -c $(CC_SWITCHES) \ + $(CC) -c $(CC_SWITCHES) -D_GNU_SOURCE \ -DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \ -DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \ -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \ |