diff options
| -rw-r--r-- | lang/tcl85/files/patch-Makefile.in | 17 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-bug214205 | 34 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-configure | 6 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-tclUnixInit.c | 6 | ||||
| -rw-r--r-- | lang/tcl85/files/patch-tclUnixPort.h | 4 |
5 files changed, 19 insertions, 48 deletions
diff --git a/lang/tcl85/files/patch-Makefile.in b/lang/tcl85/files/patch-Makefile.in index 5c08af2eff9b..a12d76e18109 100644 --- a/lang/tcl85/files/patch-Makefile.in +++ b/lang/tcl85/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2016-01-26 17:50:13 UTC +--- Makefile.in.orig 2016-02-08 20:44:53 UTC +++ Makefile.in -@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TC +@@ -54,6 +54,8 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) # Directory in which to install the include file tcl.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,7 +9,7 @@ # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -546,7 +548,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ +@@ -546,7 +548,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $( all: binaries libraries doc @@ -18,7 +18,7 @@ libraries: -@@ -557,6 +559,15 @@ doc: +@@ -557,7 +559,16 @@ doc: ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} rm -f $@ @MAKE_LIB@ @@ -26,14 +26,15 @@ + if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ + $(RANLIB) ${LIB_FILE}; \ + fi; -+ + +libtcl${SHORT_TCL_VER}.a: ${OBJS} + rm -f libtcl${SHORT_TCL_VER}.a + ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} + $(RANLIB) libtcl${SHORT_TCL_VER}.a - ++ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \ + (cd ${TOP_DIR}/win; ${MAKE} winextensions); \ @@ -701,7 +712,7 @@ gentommath_h: dltest.marker: ${STUB_LIB_FILE} cd dltest ; $(MAKE) @@ -79,7 +80,7 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -749,7 +768,7 @@ install-libraries: libraries $(INSTALL_T +@@ -749,7 +768,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install else true; \ fi; \ done; @@ -88,7 +89,7 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -758,50 +777,64 @@ install-libraries: libraries $(INSTALL_T +@@ -758,50 +777,64 @@ install-libraries: libraries $(INSTALL_TZDATA) install fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; diff --git a/lang/tcl85/files/patch-bug214205 b/lang/tcl85/files/patch-bug214205 index 8f07de9e947c..d3176230cc9e 100644 --- a/lang/tcl85/files/patch-bug214205 +++ b/lang/tcl85/files/patch-bug214205 @@ -1,33 +1,6 @@ -Index: ../generic/tclListObj.c -================================================================== ---- ../generic/tclListObj.c +--- ../generic/tclListObj.c.orig 2021-09-10 06:40:10 UTC +++ ../generic/tclListObj.c -@@ -853,12 +853,15 @@ - */ - count = numElems - first; - } - - if (objc > LIST_MAX - (numElems - count)) { -- Tcl_SetObjResult(interp, Tcl_ObjPrintf( -- "max length of a Tcl list (%d elements) exceeded", LIST_MAX)); -+ if (interp != NULL) { -+ Tcl_SetObjResult(interp, Tcl_ObjPrintf( -+ "max length of a Tcl list (%d elements) exceeded", -+ LIST_MAX)); -+ } - return TCL_ERROR; - } - isShared = (listRepPtr->refCount > 1); - numRequired = numElems - count + objc; /* Known <= LIST_MAX */ - - -Index: ../generic/tclListObj.c -================================================================== ---- ../generic/tclListObj.c -+++ ../generic/tclListObj.c -@@ -844,15 +844,12 @@ - if (first >= numElems) { - first = numElems; /* So we'll insert after last element. */ +@@ -846,11 +846,8 @@ } if (count < 0) { count = 0; @@ -41,6 +14,3 @@ Index: ../generic/tclListObj.c count = numElems - first; } - if (objc > LIST_MAX - (numElems - count)) { - if (interp != NULL) { - diff --git a/lang/tcl85/files/patch-configure b/lang/tcl85/files/patch-configure index 73ba15164141..aa0b8f1b9ee1 100644 --- a/lang/tcl85/files/patch-configure +++ b/lang/tcl85/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2014-08-29 15:40:10.000000000 +0200 -+++ configure 2014-08-29 15:40:23.000000000 +0200 -@@ -7764,15 +7764,11 @@ +--- configure.orig 2016-02-08 20:44:53 UTC ++++ configure +@@ -7669,15 +7669,11 @@ fi LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi diff --git a/lang/tcl85/files/patch-tclUnixInit.c b/lang/tcl85/files/patch-tclUnixInit.c index a7774fb92b2e..cf6fa33aa36a 100644 --- a/lang/tcl85/files/patch-tclUnixInit.c +++ b/lang/tcl85/files/patch-tclUnixInit.c @@ -1,6 +1,6 @@ ---- tclUnixInit.c.orig 2016-09-08 20:22:10.064101000 -0400 -+++ tclUnixInit.c 2016-09-08 20:22:42.345592000 -0400 -@@ -391,14 +391,6 @@ +--- tclUnixInit.c.orig 2015-10-23 11:50:57 UTC ++++ tclUnixInit.c +@@ -452,14 +452,6 @@ TclpInitPlatform(void) #endif /* SIGPIPE */ #if defined(__FreeBSD__) && defined(__GNUC__) diff --git a/lang/tcl85/files/patch-tclUnixPort.h b/lang/tcl85/files/patch-tclUnixPort.h index d91d22a955e8..362a94a49b14 100644 --- a/lang/tcl85/files/patch-tclUnixPort.h +++ b/lang/tcl85/files/patch-tclUnixPort.h @@ -1,6 +1,6 @@ ---- tclUnixPort.h.orig 2015-02-12 15:13:16 UTC +--- tclUnixPort.h.orig 2015-10-23 11:50:57 UTC +++ tclUnixPort.h -@@ -625,7 +625,9 @@ typedef int socklen_t; +@@ -622,7 +622,9 @@ typedef int socklen_t; # include <pthread.h> /* #define localtime(x) TclpLocaltime(x) * #define gmtime(x) TclpGmtime(x) */ |