diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-07-23 15:27:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-07-23 15:27:04 +0300 |
| commit | 8f8edfe737427880dfcee7296186d449f243c5d8 (patch) | |
| tree | 7375822c4c919f8d1c4d92c1a082e3bc1037d653 /cairo | |
| parent | a34126985b7b9fdb86f1bd134332b203b2d1a256 (diff) | |
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
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/cairo/makefile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 43f7b8f186a9..2b079d054ef7 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) |