cairo/cairo/makefile.mk | 2 +- config_host.mk.in | 1 + configure.in | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-)
New commits: commit 8f8edfe737427880dfcee7296186d449f243c5d8 Author: Tor Lillqvist <[email protected]> Date: Mon Jul 23 15:27:04 2012 +0300 ATSUI is not present in the 10.7 SDK even if one builds for 10.6 or earlier So use the avoid-ATSUI patch dependingh on (the newly added) MAXOSX_SDK_VERSION, not MAC_OS_X_VERSION_MAX_ALLOWED. It is not clear (to me at least) whether for instance building against SDK version 10.7 but with MAC_OS_X_VERSION_MAX_ALLOWED=1060 ensures the resulting binaries actually work on 10.6. Somebody should check. If it doesn't work, we should add a check to configure.in that the min-required and max-allowed values are not less than the SDK version. (If it would work even for MAC_OS_X_VERSION_MAX_ALLOWED=1040, we would not need to require the increasingly obsolete Xcode 3 and 10.4 SDK for "official" builds.) Change-Id: Ia7088a26024ed288db55fa734465138d44d2ae12 diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 43f7b8f..2b079d0 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -119,7 +119,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS) .ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure -.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) >= 1070 +.IF $(MACOSX_SDK_VERSION) >= 1070 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch .ENDIF CONFIGURE_FLAGS=--enable-static=no --disable-valgrind --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS) commit a34126985b7b9fdb86f1bd134332b203b2d1a256 Author: Tor Lillqvist <[email protected]> Date: Mon Jul 23 15:21:52 2012 +0300 Propagate also the OS X SDK version we are building against to the environment Change-Id: I3c1137bdb1186df773a92c34267b2324ad43ae7e diff --git a/config_host.mk.in b/config_host.mk.in index f28c03b..b335325 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -293,6 +293,7 @@ export MANDIR=@MANDIR@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ +export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ export MDDS_CPPFLAGS=@MDDS_CPPFLAGS@ diff --git a/configure.in b/configure.in index 783520f..1006d37 100644 --- a/configure.in +++ b/configure.in @@ -2428,7 +2428,7 @@ if test "$_os" = "Darwin"; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" fi - macosx_sdk_value="1040" + MACOSX_SDK_VERSION="1040" ;; 10.5) MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk" @@ -2438,19 +2438,19 @@ if test "$_os" = "Darwin"; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk" fi - macosx_sdk_value="1050" + MACOSX_SDK_VERSION="1050" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.6) MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" - macosx_sdk_value="1060" + MACOSX_SDK_VERSION="1060" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.7) MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" - macosx_sdk_value="1070" + MACOSX_SDK_VERSION="1070" AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl]) echo "Building with SDK 10.7 is known to fail in vcl" >> warn ;; @@ -2531,7 +2531,7 @@ if test "$_os" = "Darwin"; then fi AC_MSG_CHECKING([that macosx-version-max-allowed is coherent macos-with-sdk]) - if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $macosx_sdk_value; then + if test $MAC_OS_X_VERSION_MAX_ALLOWED -gt $MACOSX_SDK_VERSION; then AC_MSG_ERROR([the version maximum allowed cannot be greater thatn the sdk level]) else AC_MSG_RESULT([ok]) @@ -2541,6 +2541,7 @@ if test "$_os" = "Darwin"; then fi AC_SUBST(FRAMEWORKSHOME) AC_SUBST(MACOSX_SDK_PATH) +AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
