configure.in | 5 ++++- vcl/aqua/source/window/salframeview.mm | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 01346afea4a45a2470716d5a7ba18fcce14c475b Author: Tor Lillqvist <[email protected]> Date: Thu Aug 9 22:48:43 2012 +0300 Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED Change-Id: Ifd752925d3758a215983fe8f0ac877ab23a77915 diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 7127bf0..74f1685 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -1596,7 +1596,7 @@ private: return 0; } -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 +#if MACOSX_SDK_VERSION < 1050 - (long)conversationIdentifier #else - (NSInteger)conversationIdentifier commit 620138a1b7c78a3ab3852dcfd8bd48bfa147e7a4 Author: Tor Lillqvist <[email protected]> Date: Thu Aug 9 22:12:39 2012 +0300 Building the internal Python fails when using a more modern Mac SDK Change-Id: Iaa63d9b027bc8cb25334303243f761df127c79d5 diff --git a/configure.in b/configure.in index 637058f..0f56209 100644 --- a/configure.in +++ b/configure.in @@ -6830,7 +6830,10 @@ no|disable) dnl MinGW cross-compilation setups.) AC_MSG_RESULT([internal]) enable_python=internal - elif test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4 -o "$with_macosx_version_min_required" = 10.5 \); then + elif test $_os = Darwin -a \( "$with_macosx_version_min_required" = 10.4 -o "$with_macosx_version_min_required" = 10.5 \) \ + -a \( "$with_macosx_sdk" = 10.4 -o "$with_macosx_sdk" = 10.5 \); then + # When building against a more recent SDK the ionternal Python can't be compiled, I can't be bothered to fix that for now, + # building against a recent SDK is only for developer's own builds anyway. AC_MSG_RESULT([internal, the Python in Mac OS X $with_macosx_version_min_required is incompatible with Python3-ified pyuno]) enable_python=internal else _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
