Skip to content

Commit e4ab9d8

Browse files
committed
Homebrew's tcl-tk is no longer keg-only.
Prior to Homebrew/homebrew-core#124056, tcl-tk was "keg-only" which meant it couldn't be found on the standard include path ($HOMEBREW_PREFIX/include); however, you can always find an installed package in $HOMEBREW_PREFIX/opt. The change above moves the tcl-tk includes down a level, so here we include both; one of them should work! * tcl_tk_options.gpr (C_Compiler_Switches): on macos, provide both possible include paths. * alire.toml (version): update to 8.7.2.
1 parent b27ec16 commit e4ab9d8

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

alire.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Please note that, on macOS, tash assumes that Tcl/Tk is provided via
1616
[Homebrew](https://brew.sh).
1717
"""
1818
website = "https://github.com/simonjwright/tcladashell"
19-
version = "8.7.1"
19+
version = "8.7.2"
2020
licenses = "GPL-2.0-or-later WITH GCC-exception-2.0"
2121

2222
authors = ["Simon Wright"]

tcl_tk_options.gpr

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ abstract project Tcl_Tk_Options is
2323
Platform : Platform_Type := external ("TASH_PLATFORM", "linux");
2424

2525
C_Compiler_Switches := ();
26+
Include_Prefix := "";
27+
2628
case Platform is
2729
when "linux" =>
2830
-- I'd prefer to get CFLAGS from `pkg-config --cflags
@@ -32,12 +34,19 @@ abstract project Tcl_Tk_Options is
3234
-- & external_as_list ("CFLAGS", " ");
3335

3436
when "macos" =>
35-
C_Compiler_Switches := C_Compiler_Switches
36-
& (
37-
"-I"
38-
& external ("HOMEBREW_PREFIX", "")
39-
& "/opt/tcl-tk/include"
40-
);
37+
-- Prior to https://github.com/Homebrew/homebrew-core/pull/124056,
38+
-- tcl-tk was "keg-only"m which meant it couldn't be found on the
39+
-- standard include path ($HOMEBREW_PREFIX/include); however, you
40+
-- can always find an installed package in $HOMEBREW_PREFIX/opt.
41+
-- The change above moves the tcl-tk includes down a level, so
42+
-- here we include both; one of them should work!
43+
Include_Prefix := external ("HOMEBREW_PREFIX", "")
44+
& "/opt/tcl-tk/include";
45+
C_Compiler_Switches := C_Compiler_Switches &
46+
(
47+
"-I" & Include_Prefix,
48+
"-I" & Include_Prefix & "/tcl-tk"
49+
);
4150

4251
when "windows" =>
4352
null;

0 commit comments

Comments
 (0)