Skip to content

Commit

Permalink
Update vendor/tcl to 8.6.13
Browse files Browse the repository at this point in the history
  • Loading branch information
jmroot committed Nov 24, 2022
1 parent a82021a commit 9edb436
Show file tree
Hide file tree
Showing 2,411 changed files with 95,374 additions and 84,433 deletions.
13 changes: 9 additions & 4 deletions portmgr/dmg/postflight.in
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,17 @@ OUR_STRING="${OUR_BASESTRING} on ${TIMESTAMP}"
OLD_MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
OLD_TCL_PACKAGE_DIR=/Library/Tcl
OLD_TCL_FILES="tcl8/8.4/http-2.7.12.tm tcl8/8.4/http-2.7.13.tm \
tcl8/8.6/http-2.9.5.tm \
tcl8/8.4/platform-1.0.12.tm tcl8/8.4/platform-1.0.13.tm \
tcl8/8.4/platform-1.0.14.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.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.6/tdbc/sqlite3-1.1.3.tm \
libtcl8.5.dylib libtclstub8.5.a"
OLD_VENDOR_DIRS="thread2.7.0 thread2.7.2 thread2.7.3 tcllib1.15 \
tcllib1.17 tcllib1.18 tclx8.4 tcl8.5"
OLD_VENDOR_DIRS="thread2.7.0 thread2.7.2 thread2.7.3 thread2.8.7 \
tcllib1.15 tcllib1.17 tcllib1.18 tclx8.4 tcl8.5 itcl4.2.2 \
sqlite3.36.0 tdbc1.1.3 tdbcmysql1.1.3 tdbcodbc1.1.3 tdbcpostgres1.1.3"

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

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

46 changes: 0 additions & 46 deletions vendor/patches/tcl/configure-implicit-declarations.patch

This file was deleted.

21 changes: 16 additions & 5 deletions vendor/patches/tcl/sqlite-extern.patch
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Make the normal sqlite3 API externally visible (until we switch to tdbc...)

--- vendor/tcl/pkgs/sqlite3.36.0/Makefile.in.orig 2022-09-26 15:22:47.000000000 +1000
+++ vendor/tcl/pkgs/sqlite3.36.0/Makefile.in 2022-09-26 15:23:22.000000000 +1000
--- vendor/tcl/pkgs/sqlite3.40.0/Makefile.in.orig 2022-09-26 15:22:47.000000000 +1000
+++ vendor/tcl/pkgs/sqlite3.40.0/Makefile.in 2022-09-26 15:23:22.000000000 +1000
@@ -154,7 +154,7 @@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_EXTERN=
+PKG_CFLAGS = @PKG_CFLAGS@

# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
--- vendor/tcl/pkgs/sqlite3.36.0/configure.orig 2022-09-07 19:26:45.000000000 +1000
+++ vendor/tcl/pkgs/sqlite3.36.0/configure 2022-09-26 23:05:51.000000000 +1000
--- vendor/tcl/pkgs/sqlite3.40.0/configure.orig 2022-09-07 19:26:45.000000000 +1000
+++ vendor/tcl/pkgs/sqlite3.40.0/configure 2022-09-26 23:05:51.000000000 +1000
@@ -7527,7 +7527,7 @@

fi
Expand All @@ -22,3 +22,14 @@ Make the normal sqlite3 API externally visible (until we switch to tdbc...)
{ 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}
--- vendor/tcl8.6.13/pkgs/sqlite3.40.0/configure.orig 2022-11-25 07:06:28.000000000 +1100
+++ vendor/tcl8.6.13/pkgs/sqlite3.40.0/configure 2022-11-25 07:43:30.000000000 +1100
@@ -5665,7 +5665,7 @@

else

- PKG_CFLAGS="$PKG_CFLAGS -DSQLITE_API=MODULE_SCOPE"
+ PKG_CFLAGS="$PKG_CFLAGS"


fi
2 changes: 1 addition & 1 deletion vendor/tcl
Loading

0 comments on commit 9edb436

Please sign in to comment.