macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add copies of patches applied to vendor subdirs

Browse Source
This commit is contained in:
Joshua Root
2020-06-24 17:28:19 +10:00
parent 01afdbbabc
commit 74b31305e5
5 changed files with 386 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/patches/README
Vendored
+6
View File
@@ -0,0 +1,6 @@
These are patches that have been applied to the vendored projects. Please
re-apply them after updating to a newer version, or delete those that have
been applied upstream.
Naturally, any new changes to the vendored files should be accompanied by a
corresponding patch file here.
vendor/patches/tcl/configure-implicit-declarations.patch
Vendored
+90
View File
@@ -0,0 +1,90 @@
https://github.com/macports/macports-base/commit/aeda00dfd7aa26fa4b78ac30d76ea64cdf0a4408
diff --git a/vendor/tcl8.5.19/unix/configure b/vendor/tcl8.5.19/unix/configure
index 7ff9f7257..fcb64f18e 100755
--- a/vendor/tcl8.5.19/unix/configure
+++ b/vendor/tcl8.5.19/unix/configure
@@ -2798,6 +2798,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -14488,6 +14489,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <stdlib.h>
int main() {
extern int strstr();
exit(strstr("\0test", "test") ? 1 : 0);
@@ -14655,6 +14657,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <stdlib.h>
int main() {
extern int strtoul();
char *term, *string = "0";
@@ -14822,6 +14825,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <stdlib.h>
int main() {
extern double strtod();
char *term, *string = " +69";
@@ -14993,6 +14997,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+ #include <stdlib.h>
extern double strtod();
int main() {
char *infString="Inf", *nanString="NaN", *spaceString=" ";
@@ -16380,6 +16385,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdlib.h>
+ #include <string.h>
#define OURVAR "havecopy=yes"
int main (int argc, char *argv[])
{
diff --git a/vendor/tcl8.5.19/unix/configure.in b/vendor/tcl8.5.19/unix/configure.in
index e4255b6df..af2a26a14 100755
--- a/vendor/tcl8.5.19/unix/configure.in
+++ b/vendor/tcl8.5.19/unix/configure.in
@@ -453,6 +453,7 @@ fi
AC_CACHE_CHECK([for a putenv() that copies the buffer], tcl_cv_putenv_copy, [
AC_TRY_RUN([
#include <stdlib.h>
+ #include <string.h>
#define OURVAR "havecopy=yes"
int main (int argc, char *argv[])
{
diff --git a/vendor/tcl8.5.19/unix/tcl.m4 b/vendor/tcl8.5.19/unix/tcl.m4
index a7faae550..f482460ce 100644
--- a/vendor/tcl8.5.19/unix/tcl.m4
+++ b/vendor/tcl8.5.19/unix/tcl.m4
@@ -2587,6 +2587,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [
if test "$tcl_strtod" = 1; then
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
AC_TRY_RUN([
+ #include <stdlib.h>
extern double strtod();
int main() {
char *infString="Inf", *nanString="NaN", *spaceString=" ";
@@ -2864,7 +2865,10 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0)
if test ["$tcl_ok"] = 1; then
AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
- AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
+ AC_TRY_RUN([[
+#include <stdlib.h>
+#include <string.h>
+int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
[tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown))
if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then
tcl_ok=1
vendor/patches/tclx/configure-implicit-declarations.patch
Vendored
+46
View File
@@ -0,0 +1,46 @@
https://github.com/macports/macports-base/commit/aeda00dfd7aa26fa4b78ac30d76ea64cdf0a4408
diff --git a/vendor/tclx8.4/configure b/vendor/tclx8.4/configure
index be63b1795..154515ccc 100755
--- a/vendor/tclx8.4/configure
+++ b/vendor/tclx8.4/configure
@@ -3214,6 +3214,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -10766,6 +10767,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <sys/types.h>
#include <sys/times.h>
+#include <unistd.h>
main() {
struct tms cpu;
times(&cpu);
diff --git a/vendor/tclx8.4/configure.in b/vendor/tclx8.4/configure.in
index 173ec261f..d1be5550e 100755
--- a/vendor/tclx8.4/configure.in
+++ b/vendor/tclx8.4/configure.in
@@ -194,6 +194,7 @@ WIFEXITED(x); /* Generates compiler error if WIFEXITED uses an int. */
AC_TRY_RUN([
#include <sys/types.h>
#include <sys/times.h>
+#include <unistd.h>
main() {
struct tms cpu;
times(&cpu);
diff --git a/vendor/tclx8.4/tclconfig/tcl.m4 b/vendor/tclx8.4/tclconfig/tcl.m4
index 18d71343f..6b6ab41e4 100644
--- a/vendor/tclx8.4/tclconfig/tcl.m4
+++ b/vendor/tclx8.4/tclconfig/tcl.m4
@@ -2441,6 +2441,7 @@ AC_DEFUN(TEA_BUGGY_STRTOD, [
if test "$tcl_strtod" = 1; then
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
AC_TRY_RUN([
+ #include <stdlib.h>
extern double strtod();
int main() {
char *infString="Inf", *nanString="NaN", *spaceString=" ";
vendor/patches/tclx/implicit-panic.patch
Vendored
+218
View File
@@ -0,0 +1,218 @@
From 599111920090326d17a90853f9db5fd3c617b336 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
Date: Mon, 22 Jun 2020 00:30:24 -0700
Subject: [PATCH] tclx8.4: Use Tcl_Panic instead of deprecated / implicitly
declared panic()
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
---
vendor/tclx8.4/generic/tclExtdInt.h | 2 +-
vendor/tclx8.4/generic/tclXdup.c | 2 +-
vendor/tclx8.4/generic/tclXfcntl.c | 4 ++--
vendor/tclx8.4/generic/tclXhandles.c | 2 +-
vendor/tclx8.4/generic/tclXprofile.c | 12 ++++++------
vendor/tclx8.4/generic/tclXsignal.c | 6 +++---
vendor/tclx8.4/generic/tclXstring.c | 2 +-
vendor/tclx8.4/generic/tclXutil.c | 10 +++++-----
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/vendor/tclx8.4/generic/tclExtdInt.h b/vendor/tclx8.4/generic/tclExtdInt.h
index fd3812ff6..ffa8b30ac 100644
--- a/vendor/tclx8.4/generic/tclExtdInt.h
+++ b/vendor/tclx8.4/generic/tclExtdInt.h
@@ -47,7 +47,7 @@
*/
#ifdef TCLX_DEBUG
# define TclX_Assert(expr) ((expr) ? (void)0 : \
- panic("TclX assertion failure: %s:%d \"%s\"\n",\
+ Tcl_Panic("TclX assertion failure: %s:%d \"%s\"\n",\
__FILE__, __LINE__, "expr"))
#else
# define TclX_Assert(expr)
diff --git a/vendor/tclx8.4/generic/tclXdup.c b/vendor/tclx8.4/generic/tclXdup.c
index 41f3eec39..263e5d483 100644
--- a/vendor/tclx8.4/generic/tclXdup.c
+++ b/vendor/tclx8.4/generic/tclXdup.c
@@ -76,7 +76,7 @@ DupChannelOptions (interp, srcChannel, targetChannel)
goto errorExit;
}
if ((optArgc % 2) != 0) {
- panic("channel didn't return keyword/value pairs");
+ Tcl_Panic("channel didn't return keyword/value pairs");
}
for (idx = 0; idx < optArgc; idx += 2) {
diff --git a/vendor/tclx8.4/generic/tclXfcntl.c b/vendor/tclx8.4/generic/tclXfcntl.c
index 43a26117b..a83e8af15 100644
--- a/vendor/tclx8.4/generic/tclXfcntl.c
+++ b/vendor/tclx8.4/generic/tclXfcntl.c
@@ -211,7 +211,7 @@ GetFcntlAttr (interp, channel, mode, attrib)
return TCL_ERROR;
break;
default:
- panic ("bug in fcntl get attrib");
+ Tcl_Panic ("bug in fcntl get attrib");
}
Tcl_SetIntObj (Tcl_GetObjResult (interp), value != 0);
@@ -267,7 +267,7 @@ SetFcntlAttrObj (interp, channel, attrib, valueObj)
case ATTR_KEEPALIVE:
return TclXOSsetsockopt (interp, channel, SO_KEEPALIVE, value);
default:
- panic ("buf in fcntl set attrib");
+ Tcl_Panic ("buf in fcntl set attrib");
}
return TCL_ERROR; /* Should never be reached */
}
diff --git a/vendor/tclx8.4/generic/tclXhandles.c b/vendor/tclx8.4/generic/tclXhandles.c
index 83159139f..cc854367e 100644
--- a/vendor/tclx8.4/generic/tclXhandles.c
+++ b/vendor/tclx8.4/generic/tclXhandles.c
@@ -567,7 +567,7 @@ TclX_HandleFree (headerPtr, entryPtr)
entryHdrPtr = HEADER_AREA (entryPtr);
if (entryHdrPtr->freeLink != ALLOCATED_IDX)
- panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
+ Tcl_Panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
tblHdrPtr->freeHeadIdx =
diff --git a/vendor/tclx8.4/generic/tclXprofile.c b/vendor/tclx8.4/generic/tclXprofile.c
index e45b78669..7444aa7f3 100644
--- a/vendor/tclx8.4/generic/tclXprofile.c
+++ b/vendor/tclx8.4/generic/tclXprofile.c
@@ -240,7 +240,7 @@ PushEntry (infoPtr, cmdName, isProc, procLevel, scopeLevel, evalLevel)
* Only global level can be NULL.
*/
if (scanPtr == NULL)
- panic (PROF_PANIC, 1);
+ Tcl_Panic (PROF_PANIC, 1);
}
entryPtr->prevScopePtr = scanPtr;
infoPtr->scopeChainPtr = entryPtr;
@@ -450,7 +450,7 @@ ProfCommandEvalSetup (infoPtr, isProcPtr)
UpdateTOSTimes (infoPtr);
while (infoPtr->stackPtr->procLevel > procLevel) {
if (infoPtr->stackPtr->evalLevel != UNKNOWN_LEVEL)
- panic (PROF_PANIC, 2); /* Not an initial entry */
+ Tcl_Panic (PROF_PANIC, 2); /* Not an initial entry */
PopEntry (infoPtr);
}
@@ -595,15 +595,15 @@ ProfTraceRoutine (clientData, interp, evalLevel, command, cmdProc,
Tcl_Command cmd;
if (infoPtr->currentCmdPtr != NULL)
- panic (PROF_PANIC, 3);
+ Tcl_Panic (PROF_PANIC, 3);
cmd = Tcl_FindCommand (interp, argv [0], NULL, 0);
if (cmd == NULL)
- panic (PROF_PANIC, 4);
+ Tcl_Panic (PROF_PANIC, 4);
cmdPtr = (Command *) cmd;
if ((cmdPtr->proc != cmdProc) || (cmdPtr->clientData != cmdClientData))
- panic (PROF_PANIC, 5);
+ Tcl_Panic (PROF_PANIC, 5);
/*
* If command is to be compiled, we can't profile it.
@@ -740,7 +740,7 @@ TurnOnProfiling (infoPtr, commandMode, evalMode)
* Only global level can be NULL.
*/
if (scanPtr == NULL)
- panic (PROF_PANIC, 6);
+ Tcl_Panic (PROF_PANIC, 6);
}
infoPtr->scopeChainPtr = scanPtr;
diff --git a/vendor/tclx8.4/generic/tclXsignal.c b/vendor/tclx8.4/generic/tclXsignal.c
index 21c226cb6..96942a5f5 100644
--- a/vendor/tclx8.4/generic/tclXsignal.c
+++ b/vendor/tclx8.4/generic/tclXsignal.c
@@ -649,11 +649,11 @@ SignalTrap (signalNum)
#ifdef SIGCHLD
if (signalNum != SIGCHLD) {
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
- panic ("SignalTrap bug");
+ Tcl_Panic ("SignalTrap bug");
}
#else
if (SetSignalState (signalNum, SignalTrap, FALSE) == TCL_ERROR)
- panic ("SignalTrap bug");
+ Tcl_Panic ("SignalTrap bug");
#endif /* SIGCHLD */
#endif /* NO_SIGACTION */
}
@@ -1581,7 +1581,7 @@ SignalCmdCleanUp (clientData, interp)
break;
}
if (idx == numInterps)
- panic ("signal interp lost");
+ Tcl_Panic ("signal interp lost");
interpTable [idx] = interpTable [--numInterps];
diff --git a/vendor/tclx8.4/generic/tclXstring.c b/vendor/tclx8.4/generic/tclXstring.c
index 93e8b1e39..761148fee 100644
--- a/vendor/tclx8.4/generic/tclXstring.c
+++ b/vendor/tclx8.4/generic/tclXstring.c
@@ -677,7 +677,7 @@ TclX_CtypeObjCmd (dummy, interp, objc, objv)
#define IS_8BIT_UNICHAR(c) (c <= 255)
if (TCL_UTF_MAX > sizeof(number)) {
- panic("TclX_CtypeObjCmd: UTF character longer than a int");
+ Tcl_Panic("TclX_CtypeObjCmd: UTF character longer than a int");
}
/*FIX: Split into multiple procs */
diff --git a/vendor/tclx8.4/generic/tclXutil.c b/vendor/tclx8.4/generic/tclXutil.c
index 633e19ba8..d0ed7a487 100644
--- a/vendor/tclx8.4/generic/tclXutil.c
+++ b/vendor/tclx8.4/generic/tclXutil.c
@@ -503,7 +503,7 @@ ParseTranslationOption (strValue)
} else if (STREQU (strValue, "platform")) {
return TCLX_TRANSLATE_PLATFORM;
}
- panic ("ParseTranslationOption bug");
+ Tcl_Panic ("ParseTranslationOption bug");
return TCL_ERROR; /* Not reached */
}
@@ -535,7 +535,7 @@ FormatTranslationOption (value)
case TCLX_TRANSLATE_PLATFORM:
return "platform";
default:
- panic ("FormatTranslationOption bug");
+ Tcl_Panic ("FormatTranslationOption bug");
}
return NULL; /* Not reached */
}
@@ -649,7 +649,7 @@ TclX_GetChannelOption (interp, channel, option, valuePtr)
return TCL_OK;
fatalError:
- panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
+ Tcl_Panic ("TclX_GetChannelOption bug"); /* FIX: return error. */
return 0; /* Not reached */
}
@@ -745,7 +745,7 @@ TclX_SetChannelOption (interp, channel, option, value)
return Tcl_SetChannelOption (interp, channel, strOption, strValue);
fatalError:
- panic ("TclX_SetChannelOption bug");
+ Tcl_Panic ("TclX_SetChannelOption bug");
return TCL_ERROR; /* Not reached */
}
@@ -965,7 +965,7 @@ TclX_RestoreResultErrorInfo (interp, saveObjPtr)
/*
* This should never happen
*/
- panic ("invalid TclX result save object");
+ Tcl_Panic ("invalid TclX result save object");
}
Tcl_SetVar2Ex(interp, ERRORCODE, NULL, saveObjv[2], TCL_GLOBAL_ONLY);
vendor/patches/thread/configure-implicit-declarations.patch
Vendored
+26
View File
@@ -0,0 +1,26 @@
https://github.com/macports/macports-base/commit/aeda00dfd7aa26fa4b78ac30d76ea64cdf0a4408
diff --git a/vendor/thread2.7.3/configure b/vendor/thread2.7.3/configure
index 621bf8cd1..e8e4a7b1c 100755
--- a/vendor/thread2.7.3/configure
+++ b/vendor/thread2.7.3/configure
@@ -4003,6 +4003,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
diff --git a/vendor/thread2.7.3/tclconfig/tcl.m4 b/vendor/thread2.7.3/tclconfig/tcl.m4
index f679256fd..328508f31 100644
--- a/vendor/thread2.7.3/tclconfig/tcl.m4
+++ b/vendor/thread2.7.3/tclconfig/tcl.m4
@@ -2584,6 +2584,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [
if test "$tcl_strtod" = 1; then
AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
AC_TRY_RUN([
+ #include <stdlib.h>
extern double strtod();
int main() {
char *infString="Inf", *nanString="NaN", *spaceString=" ";