Skip to content

Commit 736c3a4

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 55a586b commit 736c3a4

File tree

7 files changed

+55
-6
lines changed

7 files changed

+55
-6
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
@@ -669,6 +669,7 @@ python_majorversion
669669
PYTHON
670670
perl_embed_ldflags
671671
perl_embed_ccflags
672+
perl_includedir
672673
perl_useshrplib
673674
perl_privlibexp
674675
perl_archlibexp
@@ -7971,6 +7972,14 @@ You might have to rebuild your Perl installation. Refer to the
79717972
documentation for details. Use --without-perl to disable building
79727973
PL/Perl." "$LINENO" 5
79737974
fi
7975+
# On most platforms, archlibexp is also where the Perl include files live ...
7976+
perl_includedir="$perl_archlibexp"
7977+
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
7978+
if test x"$PG_SYSROOT" != x"" ; then
7979+
if test -d "$PG_SYSROOT$perl_archlibexp" ; then
7980+
perl_includedir="$PG_SYSROOT$perl_archlibexp"
7981+
fi
7982+
fi
79747983

79757984
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
79767985
$as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
@@ -16161,7 +16170,14 @@ if test -z "$TCL_CONFIG_SH"; then
1616116170
set X $pgac_test_dirs; shift
1616216171
if test $# -eq 0; then
1616316172
test -z "$TCLSH" && as_fn_error $? "unable to locate tclConfig.sh because no Tcl shell was found" "$LINENO" 5
16164-
set X `echo 'puts $auto_path' | $TCLSH`; shift
16173+
pgac_test_dirs=`echo 'puts $auto_path' | $TCLSH`
16174+
# On newer macOS, $auto_path frequently doesn't include the place
16175+
# where tclConfig.sh actually lives. Append that to the end, so as not
16176+
# to break cases where a non-default Tcl installation is being used.
16177+
if test -d "$PG_SYSROOT/System/Library/Frameworks/Tcl.framework" ; then
16178+
pgac_test_dirs="$pgac_test_dirs $PG_SYSROOT/System/Library/Frameworks/Tcl.framework"
16179+
fi
16180+
set X $pgac_test_dirs; shift
1616516181
fi
1616616182

1616716183
for pgac_dir do
@@ -16210,7 +16226,7 @@ fi
1621016226
# check for <perl.h>
1621116227
if test "$with_perl" = yes; then
1621216228
ac_save_CPPFLAGS=$CPPFLAGS
16213-
CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE"
16229+
CPPFLAGS="$CPPFLAGS -I$perl_includedir/CORE"
1621416230
ac_fn_c_check_header_compile "$LINENO" "perl.h" "ac_cv_header_perl_h" "#include <EXTERN.h>
1621516231
"
1621616232
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
@@ -968,6 +968,15 @@ You might have to rebuild your Perl installation. Refer to the
968968
documentation for details. Use --without-perl to disable building
969969
PL/Perl.])
970970
fi
971+
# On most platforms, archlibexp is also where the Perl include files live ...
972+
perl_includedir="$perl_archlibexp"
973+
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
974+
if test x"$PG_SYSROOT" != x"" ; then
975+
if test -d "$PG_SYSROOT$perl_archlibexp" ; then
976+
perl_includedir="$PG_SYSROOT$perl_archlibexp"
977+
fi
978+
fi
979+
AC_SUBST(perl_includedir)dnl
971980
PGAC_CHECK_PERL_EMBED_CCFLAGS
972981
PGAC_CHECK_PERL_EMBED_LDFLAGS
973982
fi
@@ -2103,7 +2112,7 @@ fi
21032112
# check for <perl.h>
21042113
if test "$with_perl" = yes; then
21052114
ac_save_CPPFLAGS=$CPPFLAGS
2106-
CPPFLAGS="$CPPFLAGS -I$perl_archlibexp/CORE"
2115+
CPPFLAGS="$CPPFLAGS -I$perl_includedir/CORE"
21072116
AC_CHECK_HEADER(perl.h, [], [AC_MSG_ERROR([header file <perl.h> is required for Perl])],
21082117
[#include <EXTERN.h>])
21092118
# While we're at it, check that we can link to libperl.

‎contrib/hstore_plperl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ endif
3838
# last, probably because it sometimes contains some header files with names
3939
# that clash with some of ours, or with some that we include, notably on
4040
# Windows.
41-
override CPPFLAGS := $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
41+
override CPPFLAGS := $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_includedir)/CORE

‎src/Makefile.global.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ else
313313
endif
314314
perl_archlibexp = @perl_archlibexp@
315315
perl_privlibexp = @perl_privlibexp@
316+
perl_includedir = @perl_includedir@
316317
perl_embed_ccflags = @perl_embed_ccflags@
317318
perl_embed_ldflags = @perl_embed_ldflags@
318319

‎src/pl/plperl/GNUmakefile

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

2121
rpathdir = $(perl_archlibexp)/CORE
2222

‎src/template/darwin

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
# Note: Darwin is the original code name for macOS, also known as OS X.
44
# We still use "darwin" as the port name, partly because config.guess does.
55

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+
618
# Select appropriate semaphore support. Darwin 6.0 (macOS 10.2) and up
719
# support System V semaphores; before that we have to use named POSIX
820
# semaphores, which are less good for our purposes because they eat a

0 commit comments

Comments
 (0)