projects/guix·blob python-team · refs

29 lines · 1.1 KiB

1This patch hard-codes the Tk library directory during package initialization.
2
3See <http://core.tcl.tk/tk/tktview/765642ffffffffffffff>.
4
5diff --git a/generic/tkWindow.c b/generic/tkWindow.c
6index b5cbbab..96b5501 100644
7--- a/generic/tkWindow.c
8+++ b/generic/tkWindow.c
9@@ -988,6 +988,7 @@ TkCreateMainWindow(
10
11 Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
12 Tcl_SetVar2(interp, "tk_version", NULL, TK_VERSION, TCL_GLOBAL_ONLY);
13+ Tcl_SetVar2(interp, "tk_library", NULL, TK_LIBRARY, TCL_GLOBAL_ONLY);
14
15 tsdPtr->numMainWindows++;
16 return tkwin;
17diff --git a/unix/Makefile.in b/unix/Makefile.in
18index f21fdbb..c61b0df 100644
19--- a/unix/Makefile.in
20+++ b/unix/Makefile.in
21@@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c
22 $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
23
24 tkWindow.o: $(GENERIC_DIR)/tkWindow.c
25- $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
26+ $(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c
27
28 tkButton.o: $(GENERIC_DIR)/tkButton.c
29 $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c