[Libreoffice-commits] .: cairo/cairo cairo/pixman
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Jun 5 14:31:09 PDT 2011
cairo/cairo/makefile.mk | 3 +++
cairo/pixman/makefile.mk | 3 +++
2 files changed, 6 insertions(+)
New commits:
commit 15d62d4699c8ed359e62d1120df3eb989cd16f6b
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Jun 6 00:30:56 2011 +0300
Fix cairo build when cross-compiling to ppc MacOSX
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 0d3cd33..abe850d 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -109,6 +109,9 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
CONFIGURE_DIR=
CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
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)
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
cairo_CPPFLAGS+=$(EXTRA_CDEFS)
cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
BUILD_ACTION=$(GNUMAKE)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 83ea759..b344520 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -85,6 +85,9 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
.ENDIF # "$(EXTRA_CDEFS)"!=""
.ENDIF # "$(SYSBASE)"!=""
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
More information about the Libreoffice-commits
mailing list