[Libreoffice-commits] .: cairo/cairo

Tor Lillqvist tml at kemper.freedesktop.org
Tue Sep 27 07:30:02 PDT 2011


 cairo/cairo/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1682fcc2356e8442b345cefd530cafe1b2aaa9db
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Sep 27 17:27:12 2011 +0300

    Dmake's .IF expression parser is apparently broken, >= works but > doesn't

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index c13b5a8..500cdea 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -108,7 +108,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) > 1040
+.IF $(MAC_OS_X_VERSION_MIN_REQUIRED) >= 1050
 PATCH_FILES+=..$/$(TARFILE_NAME).no-atsui.patch
 .ENDIF
 CONFIGURE_FLAGS=--enable-static=no --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)


More information about the Libreoffice-commits mailing list