summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--unix/Makefile.in8
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
-rw-r--r--unix/tclAppInit.c6
-rw-r--r--win/Makefile.in18
-rw-r--r--win/makefile.vc15
-rw-r--r--win/tclAppInit.c8
8 files changed, 47 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index ec96636..423d74e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-24 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/Makefile.in Fix [Bug 2902965] stub related changes
+ * win/makefile.vc cause tclkit built to break
+ * win/tclAppInit.c
+ * unix/tcl.m4
+ * unix/Makefile.in
+ * unix/tclAppInit.c
+ * unix/configure (regenerated)
+
2009-11-25 Kevin B. Kenny <kennykb@acm.org>
* win/Makefile.in: Added a 'test-tcl' rule that is identical
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5a2e8cf..d42a0e5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.281 2009/11/18 23:46:05 nijtmans Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.282 2009/11/26 07:01:47 nijtmans Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -456,7 +456,8 @@ OO_SRCS = \
$(GENERIC_DIR)/tclOOStubInit.c
STUB_SRCS = \
- $(GENERIC_DIR)/tclStubLib.c
+ $(GENERIC_DIR)/tclStubLib.c \
+ $(GENERIC_DIR)/tclOOStubLib.o
TOMMATH_SRCS = \
$(TOMMATH_DIR)/bncore.c \
@@ -566,7 +567,6 @@ ZLIB_SRCS = \
$(ZLIB_DIR)/compress.c \
$(ZLIB_DIR)/crc32.c \
$(ZLIB_DIR)/deflate.c \
- $(ZLIB_DIR)/gzio.c \
$(ZLIB_DIR)/infback.c \
$(ZLIB_DIR)/inffast.c \
$(ZLIB_DIR)/inflate.c \
@@ -612,7 +612,7 @@ objs: ${OBJS}
tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
- ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
+ ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that the generated
diff --git a/unix/configure b/unix/configure
index 991879c..f8dcb5e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8971,12 +8971,12 @@ else
if test "$RANLIB" = ""; then
- MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
+ MAKE_LIB='$(STLIB_LD) $@ ${OBJS} ${STUB_LIB_OBJS}'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
else
- MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
+ MAKE_LIB='${STLIB_LD} $@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} $@'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6c23ace..d315658 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2066,10 +2066,10 @@ dnl # preprocessing tests use only CPPFLAGS.
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
AS_IF([test "$RANLIB" = ""], [
- MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS}'
+ MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS} ${STUB_LIB_OBJS}'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
], [
- MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
+ MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
])
])
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index a39b448..715a098 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclAppInit.c,v 1.20 2009/11/19 16:31:10 dgp Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.21 2009/11/26 07:01:46 nijtmans Exp $
*/
#include "tcl.h"
@@ -110,6 +110,10 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
+#undef Tcl_InitStubs
+ if (!Tcl_InitStubs(interp, TCL_VERSION, 0)) {
+ return TCL_ERROR;
+ }
if (Tcl_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
}
diff --git a/win/Makefile.in b/win/Makefile.in
index f518b29..fc95cfc 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.166 2009/11/25 21:02:29 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.167 2009/11/26 07:01:52 nijtmans Exp $
VERSION = @TCL_VERSION@
@@ -436,9 +436,9 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@
@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
-${TCL_LIB_FILE}: ${TCL_OBJS}
+${TCL_LIB_FILE}: ${TCL_OBJS} ${STUB_OBJS}
@$(RM) ${TCL_LIB_FILE}
- @MAKE_LIB@ ${TCL_OBJS}
+ @MAKE_LIB@ ${TCL_OBJS} ${STUB_OBJS}
@POST_MAKE_LIB@
# assume GNU make
@@ -451,9 +451,9 @@ ${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
@-$(COPY) ${DDE_LIB_FILE}.backup ${DDE_LIB_FILE}
@-$(RM) ${DDE_LIB_FILE}.backup
-${DDE_LIB_FILE}: ${DDE_OBJS} tclStubLib.$(OBJEXT)
+${DDE_LIB_FILE}: ${DDE_OBJS} ${STUB_OBJS}
@$(RM) ${DDE_LIB_FILE}
- @MAKE_LIB@ ${DDE_OBJS} tclStubLib.$(OBJEXT)
+ @MAKE_LIB@ ${DDE_OBJS} ${STUB_OBJS}
@POST_MAKE_LIB@
${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
@@ -464,9 +464,9 @@ ${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
@-$(COPY) ${REG_LIB_FILE}.backup ${REG_LIB_FILE}
@-$(RM) ${REG_LIB_FILE}.backup
-${REG_LIB_FILE}: ${REG_OBJS} tclStubLib.$(OBJEXT)
+${REG_LIB_FILE}: ${REG_OBJS} ${STUB_OBJS}
@$(RM) ${REG_LIB_FILE}
- @MAKE_LIB@ ${REG_OBJS} tclStubLib.$(OBJEXT)
+ @MAKE_LIB@ ${REG_OBJS} ${STUB_OBJS}
@POST_MAKE_LIB@
${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
@@ -477,9 +477,9 @@ ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
@-$(COPY) ${TEST_LIB_FILE}.backup ${TEST_LIB_FILE}
@-$(RM) ${TEST_LIB_FILE}.backup
-${TEST_LIB_FILE}: ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
+${TEST_LIB_FILE}: ${TCLTEST_OBJS} ${STUB_OBJS}
@$(RM) ${TEST_LIB_FILE}
- @MAKE_LIB@ ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
+ @MAKE_LIB@ ${TCLTEST_OBJS} ${STUB_OBJS}
@POST_MAKE_LIB@
# use pre-built zlib1.dll
diff --git a/win/makefile.vc b/win/makefile.vc
index a4e21e2..484bb1e 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.203 2009/11/23 21:26:32 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.204 2009/11/26 07:01:52 nijtmans Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -420,7 +420,10 @@ PLATFORMOBJS = \
$(TMP_DIR)\tclWinSock.obj \
$(TMP_DIR)\tclWinThrd.obj \
$(TMP_DIR)\tclWinTime.obj \
-!if !$(STATIC_BUILD)
+!if $(STATIC_BUILD)
+ $(TMP_DIR)\tclStubLib.obj
+ $(TMP_DIR)\tclOOStubLib.obj
+!else
$(TMP_DIR)\tcl.res
!endif
@@ -620,8 +623,8 @@ $(TCLPIPEDLL): $(WINDIR)\stub16.c
!if $(TCL_USE_STATIC_PACKAGES)
$(TCLDDELIB):
!else
-$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
- $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinDde.obj
+$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBOBJS)
+ $(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
!endif
!else
$(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
@@ -634,8 +637,8 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
!if $(TCL_USE_STATIC_PACKAGES)
$(TCLREGLIB):
!else
-$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
- $(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinReg.obj
+$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBOBJS)
+ $(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
!endif
!else
$(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 99609ab..9b7a3e9 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclAppInit.c,v 1.28 2009/11/19 16:31:11 dgp Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.29 2009/11/26 07:01:51 nijtmans Exp $
*/
#include "tcl.h"
@@ -125,6 +125,10 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
+#undef Tcl_InitStubs
+ if (!Tcl_InitStubs(interp, TCL_VERSION, 0)) {
+ return TCL_ERROR;
+ }
if (Tcl_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
}
@@ -133,7 +137,7 @@ Tcl_AppInit(
if (Tcltest_Init(interp) == TCL_ERROR) {
return TCL_ERROR;
}
- Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, Tcltest_SafeInit);
+ Tcl_StaticPackage(interp, "Tcltest", Tcltest_Init, NULL);
#endif /* TCL_TEST */
#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES