merge trunk

sebres · Jun 18, 2021 · 15d9bf0 · 15d9bf0
2 parents 34ccd62 + fa8cb8f
commit 15d9bf0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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 \