From 51eef68f73d7678bf83c791729d1e19909029f99 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Sat, 22 Apr 2023 08:17:58 -0500 Subject: [PATCH 1/3] Try building without tommath.h --- Modules/_tkinter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 385a05932a77ed..d10b518d79cbd1 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -60,6 +60,7 @@ Copyright (C) 1994 Steen Lumholt. #error "Tk older than 8.5.12 not supported" #endif +#define TCL_NO_TOMMATH_H #include #if !(defined(MS_WINDOWS) || defined(__CYGWIN__)) From 6a6ee4fe0b0aebfe4cccb991bf2c77e07715770c Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Tue, 25 Apr 2023 11:31:59 -0500 Subject: [PATCH 2/3] Add blurb --- .../next/Library/2023-04-25-16-31-00.gh-issue-103839.tpyLhI.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2023-04-25-16-31-00.gh-issue-103839.tpyLhI.rst diff --git a/Misc/NEWS.d/next/Library/2023-04-25-16-31-00.gh-issue-103839.tpyLhI.rst b/Misc/NEWS.d/next/Library/2023-04-25-16-31-00.gh-issue-103839.tpyLhI.rst new file mode 100644 index 00000000000000..1d40a8fbcd3f59 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-04-25-16-31-00.gh-issue-103839.tpyLhI.rst @@ -0,0 +1,2 @@ +Avoid compilation error due to tommath.h not being found when building +Tkinter against Tcl 8.7 built with bundled libtommath. From b215a0f12997e84e891bdd99f217782c7e418964 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Tue, 25 Apr 2023 10:53:39 -0500 Subject: [PATCH 3/3] =?UTF-8?q?Don=E2=80=99t=20always=20define=20TCL=5FNO?= =?UTF-8?q?=5FTOMMATH=5FH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Assume tommath.h is available somewhere if Tcl was built with external libtommath. --- Modules/_tkinter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index d10b518d79cbd1..fd200d12131814 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -60,7 +60,9 @@ Copyright (C) 1994 Steen Lumholt. #error "Tk older than 8.5.12 not supported" #endif +#ifndef TCL_WITH_EXTERNAL_TOMMATH #define TCL_NO_TOMMATH_H +#endif #include #if !(defined(MS_WINDOWS) || defined(__CYGWIN__))