mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-12-27 08:39:28 +08:00
5e22171310
Apple's latest rearrangements of the system-supplied headers have broken building of PL/Perl and PL/Tcl. The only practical way to fix PL/Tcl is to start using the "-isysroot" compiler flag to point to SDK-supplied headers, as Apple expects. We must also start distinguishing where to find Perl's headers from where to find its shared library; but that seems like good cleanup anyway. Extensions that formerly did something like -I$(perl_archlibexp)/CORE should now do -I$(perl_includedir)/CORE instead. perl_archlibexp is still the place to look for libperl.so, though. If for some reason you don't like the default -isysroot setting, you can override that by setting PG_SYSROOT in configure's arguments. I don't currently think people would need to do so, unless maybe for cross-version build purposes. In addition, teach configure where to find tclConfig.sh. Our traditional method of searching $auto_path hasn't worked for the last couple of macOS releases, and it now seems clear that Apple's not going to change that. The workaround of manually specifying --with-tclconfig was annoying already, but Mojave's made it a lot more so because the sysroot path now has to be included as well. Let's just wire the knowledge into configure instead. To avoid breaking builds against non-default Tcl installations (e.g. MacPorts) wherein the $auto_path method probably still works, arrange to try the additional case only after all else has failed. Back-patch to all supported versions, since at least the buildfarm cares about that. The changes are set up to not do anything on macOS releases that are old enough to not have functional sysroot trees.
105 lines
3.0 KiB
Plaintext
105 lines
3.0 KiB
Plaintext
# config/tcl.m4
|
|
|
|
# Autoconf macros to check for Tcl related things
|
|
|
|
|
|
AC_DEFUN([PGAC_PATH_TCLSH],
|
|
[PGAC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.6 tclsh86 tclsh8.5 tclsh85 tclsh8.4 tclsh84])
|
|
if test x"$TCLSH" = x""; then
|
|
AC_MSG_ERROR([Tcl shell not found])
|
|
fi
|
|
])
|
|
|
|
|
|
# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])
|
|
# ------------------------------------
|
|
# If the user doesn't specify $TCL_CONFIG_SH directly, search for it in
|
|
# the list of directories passed as parameter (from --with-tclconfig).
|
|
# If no list is given, try the Tcl shell's $auto_path.
|
|
|
|
AC_DEFUN([PGAC_PATH_TCLCONFIGSH],
|
|
[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
|
|
AC_BEFORE([$0], [PGAC_PATH_TKCONFIGSH])[]dnl
|
|
AC_MSG_CHECKING([for tclConfig.sh])
|
|
# Let user override test
|
|
if test -z "$TCL_CONFIG_SH"; then
|
|
pgac_test_dirs="$1"
|
|
|
|
set X $pgac_test_dirs; shift
|
|
if test $[#] -eq 0; then
|
|
test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tclConfig.sh because no Tcl shell was found])
|
|
pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
|
|
# On newer macOS, $auto_path frequently doesn't include the place
|
|
# where tclConfig.sh actually lives. Append that to the end, so as not
|
|
# to break cases where a non-default Tcl installation is being used.
|
|
if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
|
|
pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
|
|
fi
|
|
set X $pgac_test_dirs; shift
|
|
fi
|
|
|
|
for pgac_dir do
|
|
if test -r "$pgac_dir/tclConfig.sh"; then
|
|
TCL_CONFIG_SH=$pgac_dir/tclConfig.sh
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
|
|
if test -z "$TCL_CONFIG_SH"; then
|
|
AC_MSG_RESULT(no)
|
|
AC_MSG_ERROR([file 'tclConfig.sh' is required for Tcl])
|
|
else
|
|
AC_MSG_RESULT([$TCL_CONFIG_SH])
|
|
fi
|
|
|
|
AC_SUBST([TCL_CONFIG_SH])
|
|
])# PGAC_PATH_TCLCONFIGSH
|
|
|
|
|
|
# PGAC_PATH_TKCONFIGSH([SEARCH-PATH])
|
|
# ------------------------------------
|
|
AC_DEFUN([PGAC_PATH_TKCONFIGSH],
|
|
[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
|
|
AC_MSG_CHECKING([for tkConfig.sh])
|
|
# Let user override test
|
|
if test -z "$TK_CONFIG_SH"; then
|
|
pgac_test_dirs="$1"
|
|
|
|
set X $pgac_test_dirs; shift
|
|
if test $[#] -eq 0; then
|
|
test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tkConfig.sh because no Tcl shell was found])
|
|
set X `echo 'puts $auto_path' | $TCLSH`; shift
|
|
fi
|
|
|
|
for pgac_dir do
|
|
if test -r "$pgac_dir/tkConfig.sh"; then
|
|
TK_CONFIG_SH=$pgac_dir/tkConfig.sh
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
|
|
if test -z "$TK_CONFIG_SH"; then
|
|
AC_MSG_RESULT(no)
|
|
AC_MSG_ERROR([file 'tkConfig.sh' is required for Tk])
|
|
else
|
|
AC_MSG_RESULT([$TK_CONFIG_SH])
|
|
fi
|
|
|
|
AC_SUBST([TK_CONFIG_SH])
|
|
])# PGAC_PATH_TKCONFIGSH
|
|
|
|
|
|
# PGAC_EVAL_TCLCONFIGSH(FILE, WANTED-VARS)
|
|
# ----------------------------------------
|
|
# Assigns variables listed in WANTED-VARS by reading FILE and
|
|
# evaluating it according to the quoting scheme of tclConfig.sh and
|
|
# tkConfig.sh. Calls AC_SUBST for each variable.
|
|
|
|
AC_DEFUN([PGAC_EVAL_TCLCONFIGSH],
|
|
[. "$1"
|
|
m4_foreach([pgac_item], [$2],
|
|
[eval pgac_item=\"[$]pgac_item\"
|
|
AC_SUBST(pgac_item)])])
|