Skip to content

Commit a5361b5

Browse files
tglsfdctglsfdc
committed
Make some fixes to allow building Postgres on macOS 10.14 ("Mojave").
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.
1 parent 028fc0b commit a5361b5

File tree

6 files changed

+61
-9
lines changed

6 files changed

+61
-9
lines changed

‎config/tcl.m4

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ fi
1313

1414
# PGAC_PATH_TCLCONFIGSH([SEARCH-PATH])
1515
# ------------------------------------
16+
# If the user doesn't specify $TCL_CONFIG_SH directly, search for it in
17+
# the list of directories passed as parameter (from --with-tclconfig).
18+
# If no list is given, try the Tcl shell's $auto_path.
19+
1620
AC_DEFUN([PGAC_PATH_TCLCONFIGSH],
1721
[AC_REQUIRE([PGAC_PATH_TCLSH])[]dnl
1822
AC_BEFORE([$0], [PGAC_PATH_TKCONFIGSH])[]dnl
@@ -24,7 +28,14 @@ if test -z "$TCL_CONFIG_SH"; then
2428
set X $pgac_test_dirs; shift
2529
if test $[#] -eq 0; then
2630
test -z "$TCLSH" && AC_MSG_ERROR([unable to locate tclConfig.sh because no Tcl shell was found])
27-
set X `echo 'puts $auto_path' | $TCLSH`; shift
31+
pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
32+
# On newer macOS, $auto_path frequently doesn't include the place
33+
# where tclConfig.sh actually lives. Append that to the end, so as not
34+
# to break cases where a non-default Tcl installation is being used.
35+
if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
36+
pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
37+
fi
38+
set X $pgac_test_dirs; shift
2839
fi
2940
3041
for pgac_dir do

‎configure

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@ python_majorversion
670670
PYTHON
671671
perl_embed_ldflags
672672
perl_embed_ccflags
673+
perl_includedir
673674
perl_useshrplib
674675
perl_privlibexp
675676
perl_archlibexp
@@ -7503,6 +7504,14 @@ perl_useshrplib=`$PERL -MConfig -e 'print $Config{useshrplib}'`
75037504
test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'`
75047505
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_useshrplib" >&5
75057506
$as_echo "$perl_useshrplib" >&6; }
7507+
# On most platforms, archlibexp is also where the Perl include files live ...
7508+
perl_includedir="$perl_archlibexp"
7509+
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
7510+
if test x"$PG_SYSROOT" != x"" ; then
7511+
if test -d "$PG_SYSROOT$perl_archlibexp" ; then
7512+
perl_includedir="$PG_SYSROOT$perl_archlibexp"
7513+
fi
7514+
fi
75067515

75077516
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
75087517
$as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
@@ -14637,7 +14646,14 @@ if test -z "$TCL_CONFIG_SH"; then
1463714646
set X $pgac_test_dirs; shift
1463814647
if test $# -eq 0; then
1463914648
test -z "$TCLSH" && as_fn_error $? "unable to locate tclConfig.sh because no Tcl shell was found" "$LINENO" 5
14640-
set X `echo 'puts $auto_path' | $TCLSH`; shift
14649+
pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
14650+
# On newer macOS, $auto_path frequently doesn't include the place
14651+
# where tclConfig.sh actually lives. Append that to the end, so as not
14652+
# to break cases where a non-default Tcl installation is being used.
14653+
if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
14654+
pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
14655+
fi
14656+
set X $pgac_test_dirs; shift
1464114657
fi
1464214658

1464314659
for pgac_dir do
@@ -14683,7 +14699,7 @@ fi
1468314699
# check for <perl.h>
1468414700
if test "$with_perl" = yes; then
1468514701
ac_save_CPPFLAGS=$CPPFLAGS
14686-
CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE"
14702+
CPPFLAGS="$CPPFLAGS -I$perl_includedir/CORE"
1468714703
ac_fn_c_check_header_compile "$LINENO" "perl.h" "ac_cv_header_perl_h" "#include <EXTERN.h>
1468814704
"
1468914705
if test "x$ac_cv_header_perl_h" = xyes; then :

‎configure.in

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,15 @@ if test "$with_perl" = yes; then
915915
AC_MSG_ERROR([Perl not found])
916916
fi
917917
PGAC_CHECK_PERL_CONFIGS([archlibexp,privlibexp,useshrplib])
918+
# On most platforms, archlibexp is also where the Perl include files live ...
919+
perl_includedir="$perl_archlibexp"
920+
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
921+
if test x"$PG_SYSROOT" != x"" ; then
922+
if test -d "$PG_SYSROOT$perl_archlibexp" ; then
923+
perl_includedir="$PG_SYSROOT$perl_archlibexp"
924+
fi
925+
fi
926+
AC_SUBST(perl_includedir)dnl
918927
PGAC_CHECK_PERL_EMBED_CCFLAGS
919928
PGAC_CHECK_PERL_EMBED_LDFLAGS
920929
fi
@@ -1934,7 +1943,7 @@ fi
19341943
# check for <perl.h>
19351944
if test "$with_perl" = yes; then
19361945
ac_save_CPPFLAGS=$CPPFLAGS
1937-
CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE"
1946+
CPPFLAGS="$CPPFLAGS -I$perl_includedir/CORE"
19381947
AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
19391948
[#include <EXTERN.h>])
19401949
# While we're at it, check that we can link to libperl.

‎src/Makefile.global.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ else
306306
endif
307307
perl_archlibexp = @perl_archlibexp@
308308
perl_privlibexp = @perl_privlibexp@
309+
perl_includedir = @perl_includedir@
309310
perl_useshrplib = @perl_useshrplib@
310311
perl_embed_ccflags = @perl_embed_ccflags@
311312
perl_embed_ldflags = @perl_embed_ldflags@

‎src/pl/plperl/GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ endif
2626
# probably because it sometimes contains some header files with names
2727
# that clash with some of ours, or with some that we include, notably on
2828
# Windows.
29-
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
29+
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_includedir)/CORE
3030

3131
rpathdir = $(perl_archlibexp)/CORE
3232

‎src/template/darwin

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
# src/template/darwin
22

3-
# Select appropriate semaphore support. Darwin 6.0 (Mac OS X 10.2) and up
4-
# support System V semaphores; before that we have to use POSIX semaphores,
5-
# which are less good for our purposes because they eat a file descriptor
6-
# per backend per max_connection slot.
3+
# Note: Darwin is the original code name for macOS, also known as OS X.
4+
# We still use "darwin" as the port name, partly because config.guess does.
5+
6+
# Select where system include files should be sought.
7+
if test x"$PG_SYSROOT" = x"" ; then
8+
PG_SYSROOT=`xcodebuild -version -sdk macosx Path 2>/dev/null`
9+
fi
10+
if test x"$PG_SYSROOT" != x"" ; then
11+
if test -d "$PG_SYSROOT" ; then
12+
CPPFLAGS="$CPPFLAGS -isysroot $PG_SYSROOT"
13+
else
14+
PG_SYSROOT=""
15+
fi
16+
fi
17+
18+
# Select appropriate semaphore support. Darwin 6.0 (macOS 10.2) and up
19+
# support System V semaphores; before that we have to use named POSIX
20+
# semaphores, which are less good for our purposes because they eat a
21+
# file descriptor per backend per max_connection slot.
722
case $host_os in
823
darwin[015].*)
924
USE_NAMED_POSIX_SEMAPHORES=1

0 commit comments

Comments
 (0)