From 788236542834710698cace10523d24ae7143279d Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 15 Apr 2023 19:02:44 +0000 Subject: Backout fix for [718de2132f487cf2]: It breaks on MacOS and other systems which don't support the --strip-unneeded option --- unix/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index 2f28fcf..21d4085 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -151,8 +151,7 @@ SHELL = @MAKEFILE_SHELL@ # distribution, which is slower but guaranteed to work. INSTALL_STRIP_PROGRAM = -s -# Use --strip-unneeded instead of -x. See issue 718de2132f487cf2 -INSTALL_STRIP_LIBRARY = -S --strip-unneeded +INSTALL_STRIP_LIBRARY = -S -x INSTALL = $(SHELL) $(UNIX_DIR)/install-sh -c INSTALL_PROGRAM = ${INSTALL} -- cgit v0.12 From 52425dcf5d50616645b90e2acee65ef733962afa Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 15 Apr 2023 19:09:41 +0000 Subject: Add one more unused stub entry --- generic/tcl.decls | 2 +- generic/tclDecls.h | 9 ++++++--- generic/tclStubInit.c | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/generic/tcl.decls b/generic/tcl.decls index c3d5073..58b7400 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2339,7 +2339,7 @@ declare 653 { # ----- BASELINE -- FOR -- 8.7.0 / 9.0.0 ----- # -declare 687 { +declare 688 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 078974c..11e8e59 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -1877,7 +1877,8 @@ EXTERN unsigned char * TclGetByteArrayFromObj_(Tcl_Obj *objPtr, /* Slot 684 is reserved */ /* Slot 685 is reserved */ /* Slot 686 is reserved */ -/* 687 */ +/* Slot 687 is reserved */ +/* 688 */ EXTERN void TclUnusedStubEntry(void); typedef struct { @@ -2601,7 +2602,8 @@ typedef struct TclStubs { void (*reserved684)(void); void (*reserved685)(void); void (*reserved686)(void); - void (*tclUnusedStubEntry) (void); /* 687 */ + void (*reserved687)(void); + void (*tclUnusedStubEntry) (void); /* 688 */ } TclStubs; extern const TclStubs *tclStubsPtr; @@ -3953,8 +3955,9 @@ extern const TclStubs *tclStubsPtr; /* Slot 684 is reserved */ /* Slot 685 is reserved */ /* Slot 686 is reserved */ +/* Slot 687 is reserved */ #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 687 */ + (tclStubsPtr->tclUnusedStubEntry) /* 688 */ #endif /* defined(USE_TCL_STUBS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index c504586..d6621b6 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1726,7 +1726,8 @@ const TclStubs tclStubs = { 0, /* 684 */ 0, /* 685 */ 0, /* 686 */ - TclUnusedStubEntry, /* 687 */ + 0, /* 687 */ + TclUnusedStubEntry, /* 688 */ }; /* !END!: Do not edit above this line. */ -- cgit v0.12