Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitee6c08b

Browse files
committed
Back off using -isysroot on Darwin.
Rethink the solution applied in commit5e22171 to get PL/Tcl tobuild on macOS Mojave. I feared that adding -isysroot globally mighthave undesirable consequences, and sure enough Jakob Egger reportedone: it complicates building extensions with a different Xcode versionthan was used for the core server. (I find that a risky propositionin general, but apparently it works most of the time, so we shouldn'tbreak it if we don't have to.)We'd already adopted the solution for PL/Perl of inserting the sysrootpath directly into the -I switches used to find Perl's headers, and wecan do the same thing for PL/Tcl by changing the -iwithsysroot switchthat Apple's tclConfig.sh reports. This restricts the risks to PL/Perland PL/Tcl themselves and directly-dependent extensions, which is a lotmore pleasing in general than a global -isysroot switch.Along the way, tighten the test to see if we need to inject the sysrootpath into $perl_includedir, as I'd speculated about upthread but notgotten round to doing.As before, back-patch to all supported versions.Discussion:https://postgr.es/m/20840.1537850987@sss.pgh.pa.us
1 parent7bee1d5 commitee6c08b

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

‎configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7976,7 +7976,7 @@ PL/Perl." "$LINENO" 5
79767976
perl_includedir="$perl_archlibexp"
79777977
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
79787978
iftest x"$PG_SYSROOT"!= x"";then
7979-
iftest -d"$PG_SYSROOT$perl_archlibexp";then
7979+
iftest -f"$PG_SYSROOT$perl_archlibexp/CORE/perl.h";then
79807980
perl_includedir="$PG_SYSROOT$perl_archlibexp"
79817981
fi
79827982
fi
@@ -16207,6 +16207,11 @@ eval TCL_SHARED_BUILD=\"$TCL_SHARED_BUILD\"
1620716207
as_fn_error$?"cannot build PL/Tcl because Tcl is not a shared library
1620816208
Use --without-tcl to disable building PL/Tcl.""$LINENO" 5
1620916209
fi
16210+
# Some macOS versions report an include spec that uses -iwithsysroot.
16211+
# We don't really want to use -isysroot, so translate that if we can.
16212+
iftest x"$PG_SYSROOT"!= x"";then
16213+
TCL_INCLUDE_SPEC="`echo"$TCL_INCLUDE_SPEC"| sed"s|-iwithsysroot */|-I$PG_SYSROOT/|"`"
16214+
fi
1621016215
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
1621116216
ac_save_CPPFLAGS=$CPPFLAGS
1621216217
CPPFLAGS="$TCL_INCLUDE_SPEC$CPPFLAGS"

‎configure.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ PL/Perl.])
972972
perl_includedir="$perl_archlibexp"
973973
# ... but on some macOS versions, we must look under $PG_SYSROOT instead
974974
if test x"$PG_SYSROOT" != x"" ; then
975-
if test -d "$PG_SYSROOT$perl_archlibexp" ; then
975+
if test -f "$PG_SYSROOT$perl_archlibexp/CORE/perl.h" ; then
976976
perl_includedir="$PG_SYSROOT$perl_archlibexp"
977977
fi
978978
fi
@@ -2102,6 +2102,11 @@ if test "$with_tcl" = yes; then
21022102
AC_MSG_ERROR([cannot build PL/Tcl because Tcl is not a shared library
21032103
Use --without-tcl to disable building PL/Tcl.])
21042104
fi
2105+
# Some macOS versions report an include spec that uses -iwithsysroot.
2106+
# We don't really want to use -isysroot, so translate that if we can.
2107+
if test x"$PG_SYSROOT" != x"" ; then
2108+
TCL_INCLUDE_SPEC="`echo "$TCL_INCLUDE_SPEC" | sed "s|-iwithsysroot */|-I $PG_SYSROOT/|"`"
2109+
fi
21052110
# now that we have TCL_INCLUDE_SPEC, we can check for <tcl.h>
21062111
ac_save_CPPFLAGS=$CPPFLAGS
21072112
CPPFLAGS="$TCL_INCLUDE_SPEC $CPPFLAGS"

‎src/template/darwin

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
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.
6+
# Select where some include files should be sought.
7+
# We may eventually be forced to use "-isysroot" with this value,
8+
# but for now, it only affects Perl and Tcl include files.
79
if test x"$PG_SYSROOT" = x"" ; then
810
PG_SYSROOT=`xcodebuild -version -sdk macosx Path 2>/dev/null`
911
fi
12+
# Old xcodebuild versions may produce garbage, so validate the result.
1013
if test x"$PG_SYSROOT" != x"" ; then
11-
if test -d "$PG_SYSROOT" ; then
12-
CPPFLAGS="$CPPFLAGS -isysroot $PG_SYSROOT"
13-
else
14+
if test \! -d "$PG_SYSROOT" ; then
1415
PG_SYSROOT=""
1516
fi
1617
fi

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp