Attachment "tcl-win-tzdata.patch" to
ticket [4bd630f167]
added by
Ericson2314
2026-08-14 23:36:43.
Index: win/Makefile.in
==================================================================
--- win/Makefile.in
+++ win/Makefile.in
@@ -232,10 +232,11 @@
ZIP_PROG_OPTIONS = @ZIP_PROG_OPTIONS@
ZIP_PROG_VFSSEARCH = @ZIP_PROG_VFSSEARCH@
SHARED_BUILD = @SHARED_BUILD@
INSTALL_MSGS = @INSTALL_MSGS@
INSTALL_LIBRARIES = @INSTALL_LIBRARIES@
+INSTALL_TZDATA = @INSTALL_TZDATA@
# Fully qualify library path so that `make test`
# does not depend on the current directory.
# Only define these if not embedding the library
ifeq ($(ZIPFS_BUILD), 0)
@@ -887,11 +888,11 @@
@if [ -f $(REG_LIB_FILE) ]; then \
echo Installing $(REG_LIB_FILE); \
$(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
fi
-install-libraries: libraries install-tzdata install-msgs
+install-libraries: libraries $(INSTALL_TZDATA) $(INSTALL_MSGS)
@for i in "$(prefix)/lib" "$(INCLUDE_INSTALL_DIR)" \
"$(SCRIPT_INSTALL_DIR)" "$(MODULE_INSTALL_DIR)"; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
Index: win/configure.ac
==================================================================
--- win/configure.ac
+++ win/configure.ac
@@ -205,10 +205,38 @@
fi
AC_SUBST(ZIPFS_BUILD)
AC_SUBST(TCL_ZIP_FILE)
AC_SUBST(INSTALL_LIBRARIES)
AC_SUBST(INSTALL_MSGS)
+
+#--------------------------------------------------------------------
+# Timezone data
+#--------------------------------------------------------------------
+
+AC_MSG_CHECKING([for timezone data])
+AC_ARG_WITH(tzdata,
+ AS_HELP_STRING([--with-tzdata],
+ [install timezone data (default: yes)]),
+ [tcl_ok=$withval], [tcl_ok=yes])
+#
+# Unlike on Unix there is no system copy to fall back on, so the default is
+# to install ours. Saying no is for a build that supplies the data by some
+# other means.
+#
+case $tcl_ok in
+ no)
+ AC_MSG_RESULT([supplied by other means])
+ ;;
+ yes)
+ AC_MSG_RESULT([supplied by Tcl])
+ INSTALL_TZDATA=install-tzdata
+ ;;
+ *)
+ AC_MSG_ERROR([invalid argument: $tcl_ok])
+ ;;
+esac
+AC_SUBST(INSTALL_TZDATA)
#--------------------------------------------------------------------
# Perform additinal compiler tests.
#--------------------------------------------------------------------
