Skip to content

Commit

Permalink
Update bundled Tcl to 8.6.16
Browse files Browse the repository at this point in the history
  • Loading branch information
jmroot committed Jan 5, 2025
1 parent b2dcbb9 commit 3954f08
Show file tree
Hide file tree
Showing 2,399 changed files with 68,588 additions and 169,478 deletions.
14 changes: 8 additions & 6 deletions portmgr/dmg/postflight.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,20 @@ tcl8/8.4/platform-1.0.14.tm tcl8/8.4/platform-1.0.18.tm \
tcl8/8.5/msgcat-1.5.2.tm \
tcl8/8.5/tcltest-2.3.5.tm tcl8/8.5/tcltest-2.3.8.tm \
tcl8/8.5/tcltest-2.5.3.tm tcl8/8.5/tcltest-2.5.5.tm \
tcl8/8.5/tcltest-2.5.7.tm \
tcl8/8.5/tcltest-2.5.7.tm tcl8/8.5/tcltest-2.5.8.tm \
tcl8/8.6/tdbc/sqlite3-1.1.3.tm tcl8/8.6/tdbc/sqlite3-1.1.5.tm \
tcl8/8.6/tdbc/sqlite3-1.1.7.tm \
tcl8/8.6/tdbc/sqlite3-1.1.7.tm tcl8/8.6/tdbc/sqlite3-1.1.9.tm \
tcl8/8.6/tdbc/sqlite3-1.1.9.uuid \
libtcl8.5.dylib libtclstub8.5.a"
OLD_VENDOR_DIRS="thread2.7.0 thread2.7.2 thread2.7.3 thread2.8.7 \
thread2.8.8 thread2.8.9 \
thread2.8.8 thread2.8.9 thread2.8.10 \
tcllib1.15 tcllib1.17 tcllib1.18 tclx8.4 tcl8.5 \
itcl4.2.2 itcl4.2.3 itcl4.2.4 \
sqlite3.36.0 sqlite3.40.0 sqlite3.44.2 \
itcl4.2.2 itcl4.2.3 itcl4.2.4 itcl4.3.0 \
sqlite3.36.0 sqlite3.40.0 sqlite3.44.2 sqlite3.45.3 \
tdbc1.1.3 tdbcmysql1.1.3 tdbcodbc1.1.3 tdbcpostgres1.1.3 \
tdbc1.1.5 tdbcmysql1.1.5 tdbcodbc1.1.5 tdbcpostgres1.1.5 \
tdbc1.1.7 tdbcmysql1.1.7 tdbcodbc1.1.7 tdbcpostgres1.1.7"
tdbc1.1.7 tdbcmysql1.1.7 tdbcodbc1.1.7 tdbcpostgres1.1.7 \
tdbc1.1.9 tdbcmysql1.1.9 tdbcodbc1.1.9 tdbcpostgres1.1.9"

# Create config files from defaults if not present
function setup_configs {
Expand Down
11 changes: 7 additions & 4 deletions vendor/Makefile.in

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 16 additions & 19 deletions vendor/patches/tcl/clonefile.patch
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
--- vendor/tcl/unix/configure.orig 2024-10-05 22:33:31
+++ vendor/tcl/unix/configure 2024-10-05 22:41:49
@@ -10881,6 +10881,20 @@
if test "x$ac_cv_func_copyfile" = xyes
then :
printf "%s\n" "#define HAVE_COPYFILE 1" >>confdefs.h
+
+fi
+
+ ac_fn_c_check_header_compile "$LINENO" "sys/clonefile.h" "ac_cv_header_sys_clonefile_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_clonefile_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_SYS_CLONEFILE_H 1" >>confdefs.h
+
+fi
+
+ ac_fn_c_check_func "$LINENO" "clonefile" "ac_cv_func_clonefile"
+if test "x$ac_cv_func_clonefile" = xyes
+then :
+ printf "%s\n" "#define HAVE_CLONEFILE 1" >>confdefs.h
@@ -17439,7 +17439,7 @@ fi
done


-for ac_header in copyfile.h
+for ac_header in sys/clonefile.h copyfile.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -17589,7 +17589,7 @@ fi
done

fi

-for ac_func in copyfile
+for ac_func in clonefile copyfile
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
--- vendor/tcl/unix/tclUnixFCmd.c.orig
+++ vendor/tcl/unix/tclUnixFCmd.c
@@ -51,6 +51,21 @@
Expand Down
9 changes: 9 additions & 0 deletions vendor/patches/tcl/delete-files.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#! /bin/sh

# Delete unneeded (for us) files from the Tcl source distribution.
# Run from vendor/

rm tcl8.*/compat/zlib/doc/crc-doc.1.0.pdf
rm -r tcl8.*/compat/zlib/{amiga,contrib,msdos,nintendods,old,os400,qnx,watcom,win32,win64,win64-arm}
rm -r tcl8.*/pkgs/{sqlite3,itcl,tdbc,thread}*/win
rm -r tcl8.*/win
20 changes: 10 additions & 10 deletions vendor/patches/tcl/sqlite-extern.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Make the normal sqlite3 API externally visible (until we switch to tdbc...)

--- vendor/tcl/pkgs/sqlite3.45.3/Makefile.in.orig 2024-03-01 00:32:11
+++ vendor/tcl/pkgs/sqlite3.45.3/Makefile.in 2024-03-01 00:26:48
--- vendor/tcl/pkgs/sqlite3.47.2/Makefile.in.orig 2024-03-01 00:32:11
+++ vendor/tcl/pkgs/sqlite3.47.2/Makefile.in 2024-03-01 00:26:48
@@ -155,7 +155,7 @@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I. -I$(srcdir)/..
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
Expand All @@ -11,9 +11,9 @@ Make the normal sqlite3 API externally visible (until we switch to tdbc...)

# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.ac checks for the necessary components
--- vendor/tcl/pkgs/sqlite3.45.3/configure.orig 2024-03-01 00:31:18
+++ vendor/tcl/pkgs/sqlite3.45.3/configure 2024-03-01 00:26:48
@@ -5671,7 +5671,7 @@
--- vendor/tcl/pkgs/sqlite3.47.2/configure.orig 2024-12-10 07:49:12
+++ vendor/tcl/pkgs/sqlite3.47.2/configure 2025-01-06 01:48:04
@@ -5775,7 +5775,7 @@

else

Expand All @@ -22,12 +22,12 @@ Make the normal sqlite3 API externally visible (until we switch to tdbc...)


fi
@@ -7598,7 +7598,7 @@

@@ -7817,7 +7817,7 @@
esac
fi
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
- SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
+ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
printf %s "checking if ld accepts -single_module flag... " >&6; }
if test ${tcl_cv_ld_single_module+y}
# TEA specific: link shlib with current and compatibility version flags
vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
2 changes: 1 addition & 1 deletion vendor/tcl
69 changes: 0 additions & 69 deletions vendor/tcl8.6.15/compat/zlib/amiga/Makefile.pup

This file was deleted.

68 changes: 0 additions & 68 deletions vendor/tcl8.6.15/compat/zlib/amiga/Makefile.sas

This file was deleted.

57 changes: 0 additions & 57 deletions vendor/tcl8.6.15/compat/zlib/contrib/README.contrib

This file was deleted.

Loading

0 comments on commit 3954f08

Please sign in to comment.