luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-08-22 14:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

GHA: MacOS maintenance update

Browse Source 
GHA obsoleted macos-12 so we move to macos-13 for Intel.  Building with oldest
Intel image to provide feedback of continued expected support on that platform,
while ARM64 builds with latest to check the other end of their SDKs.

Lock the TCL version via brew to 8.6+ (currently the project is not expected to
build on TCL9 until other work is completed) so this is causing build failure.

Added additional diagnostics to show the location of executables/DSOs if they
got built from the tree.

Introduced GHA timeout clamping (MacOS default shell seems not to behave under
CI as well as Linux does, re signal/pipe handling)

'brew install tcl-tk@8' appears to append the @8 to the installed path such as
/usr/local/opt/tcl-tk@8 which configure needs to know.  configure_mac updated
to detect this now TCL9 is the default version that maybe installed at the old
location.  Then there is the issue of both TCL versions being installed
side-by-side on the same system causing more issues over selection.
This commit is contained in:
Darryl L. Miles
2025-01-04 11:23:39 -05:00
committed by Tim Edwards
parent 3f85689985
commit 46eb71491c
3 changed files with 139 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/configure_mac
+52 -2
View File
@@ -36,6 +36,56 @@ do
fi
done
# This appeared to have the "@8" suffix add to the installed path
brew_prefix_tcl_tk=$(brew --prefix tcl-tk)
echo "brew_prefix_tcl_tk=$(brew --prefix tcl-tk)"
brew_prefix_tcl_tk_at8=$(brew --prefix tcl-tk@8)
echo "brew_prefix_tcl_tk_at8=$(brew --prefix tcl-tk@8)"
# Changed the order to reflect current state to use TCL8 in preference to default,
# but you can swap/edit these to modify the first-found-is-selected for building.
for d in "${brew_prefix_tcl_tk_at8}" "${brew_prefix_tcl_tk}"
do
if [ -d "$d" ]
then
echo "Directory Exists: $d"
ls -l "${d}/"
if [ -z "$tcl_tk_prefix_dir" ]
then
if [ -f "${d}/include/tcl.h" ]
then
echo "Found tcl-tk: ${d}"
tcl_tk_prefix_dir="${d}"
else
echo "WARNING: Not Found tcl.h in ${d}/include/"
ls -l "${d}/include/"
if [ -d "${d}/lib" ]
then
# A subdir exists
ls -l "${d}/lib"
# TEST does it build if we set
echo "Found tcl-tk (lib): ${d}/lib"
tcl_tk_prefix_dir="${d}/lib"
elif [ -d "${d}/include/tcl-tk" ]
then
# A subdir exists
ls -l "${d}/include/tcl-tk"
# TEST does it build if we set
if [ -f "${d}/include/tcl-tk/tcl.h" ]
then
echo "Found tcl-tk: ${d}/include/tcl-tk"
tcl_tk_prefix_dir="${d}/include/tcl-tk"
fi
fi
fi
else
echo "WARNING: Multiple tcl-tk packages found installed (side-by-side) please manually edit this script or fixup configure command line" 1>&2
echo "WARNING: The version being used for this build is: $tcl_tk_prefix_dir" 1>&2
fi
fi
done
# Restores the original script default when the above detection fails
tcl_tk_prefix_dir=${tcl_tk_prefix_dir:-$brew_prefix_tcl_tk}
if [ -n "$x11_include_dir" ]
then
# On some versions of MacOSX (example macosx12 / XCode 14.2) the tcl-tk
@@ -61,8 +111,8 @@ then
fi
./configure\
--with-tcl=$(brew --prefix tcl-tk)\
--with-tk=$(brew --prefix tcl-tk)\
--with-tcl="${tcl_tk_prefix_dir}"\
--with-tk="${tcl_tk_prefix_dir}"\
--with-cairo=$(brew --prefix cairo)/include\
$CONFARGS\
"LDFLAGS=-L$(brew --prefix cairo)/lib"