aboutsummaryrefslogtreecommitdiff
This patch hard-codes the Tk library directory during package initialization.

See <http://core.tcl.tk/tk/tktview/765642ffffffffffffff>.

diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index b5cbbab..96b5501 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -988,6 +988,7 @@ TkCreateMainWindow(
 
     Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tk_version",    NULL, TK_VERSION,     TCL_GLOBAL_ONLY);
+    Tcl_SetVar2(interp, "tk_library",    NULL, TK_LIBRARY,     TCL_GLOBAL_ONLY);
 
     tsdPtr->numMainWindows++;
     return tkwin;
diff --git a/unix/Makefile.in b/unix/Makefile.in
index f21fdbb..c61b0df 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1029,7 +1029,7 @@ tkVisual.o: $(GENERIC_DIR)/tkVisual.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkVisual.c
 
 tkWindow.o: $(GENERIC_DIR)/tkWindow.c
-	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkWindow.c
+	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" $(GENERIC_DIR)/tkWindow.c
 
 tkButton.o: $(GENERIC_DIR)/tkButton.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkButton.c
1725ff906df363f45269b9d8cc59adda3f6435'>gnu: openjdk-10: Fix building on aarch64-linux.Efraim Flashner * gnu/packages/java.scm (openjdk-10)[arguments]: Replace inherited 'patch-for-aarch64 phase for changes in source code layout. Co-authored-by: Christopher Baines <mail@cbaines.net> Co-authored-by: Tim Johann <t1m@phrogstar.de> 2023-09-21gnu: Add jbr@21-b240.22.Danny Milosavljevic * gnu/packages/java.scm (jbr21): New variable. 2023-09-21gnu: Add openjdk@21.Danny Milosavljevic * gnu/packages/java.scm (openjdk21): New variable. * gnu/packages/patches/openjdk-21-fix-rpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. 2023-09-21gnu: Add openjdk@20.Danny Milosavljevic * gnu/packages/java.scm (openjdk20): New variable.