[Libreoffice-commits] .: 3 commits - cairo/cairo cairo/pixman hunspell/makefile.mk python/makefile.mk

[Tor Lillqvist]

 cairo/cairo/makefile.mk  |   12 +++++++++++-
 cairo/pixman/makefile.mk |   11 ++++++++++-
 hunspell/makefile.mk     |    4 ++++
 python/makefile.mk       |    6 ++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit c80dcea029d03067d04a96fe92a24fbace0265c6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 30 01:15:48 2011 +0300

    Cross-compiling and iOS support

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index d6d1739..a077ec9 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -145,7 +145,15 @@ cairo_CFLAGS+=-march=i486
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
+CONFIGURE_FLAGS=--disable-static --enable-xlib
+.ENDIF
+CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -201,6 +209,8 @@ OUT2BIN+=src$/.libs$/*.dll
 OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=src$/.libs$/libcairo-1.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
 .ENDIF
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 6d2504b..1f61bfa 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -120,8 +120,15 @@ pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS=--disable-shared
+.ELSE
+CONFIGURE_FLAGS=--disable-static
+.ENDIF
 CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -142,6 +149,8 @@ OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=pixman$/.libs$/libpixman-1.a
 .ELSE
 OUT2LIB+=pixman$/.libs$/libpixman-1.so*
 .ENDIF
commit c516cab7263dce3dc50728d32e064bf560b03c8a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 27 21:04:26 2011 +0300

    Pass --build and --host options when cross-compiling

diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 6ab9b36..a28d63e 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -66,6 +66,10 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 .ENDIF
 
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
+
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
 OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
commit e7ebd0644973b8f38f716b94c7ba8217d07ca6dc
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 27 20:58:57 2011 +0300

    Don't build Python if DISABLE_PYTHON is TRUE
    
    I don't know if this is the right thing to do. The --disable-python
    switch is documented to "Disable build of Python 2.x UNO API". Does
    that mean that it should disable use of Python at run-time completely?
    What about use of Python tools at build-time, do we have such? Will
    --disable-python then disable their use, too?

diff --git a/python/makefile.mk b/python/makefile.mk
index fb729bd..f51e7e8 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -33,6 +33,9 @@ TARGET=so_python
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
+
+.IF "$(DISABLE_PYTHON)"!="TRUE"
+
 .INCLUDE :      pyversion.mk
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
@@ -146,7 +149,9 @@ PYVERSIONFILE=$(MISC)$/pyversion.mk
 
 
 .INCLUDE : set_ext.mk
+.ENDIF # DISABLE_PYTHON != TRUE
 .INCLUDE : target.mk
+.IF "$(DISABLE_PYTHON)"!="TRUE"
 .INCLUDE : tg_ext.mk
 
 .IF "$(L10N_framework)"==""
@@ -182,3 +187,4 @@ $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     -rm -f $@
     cat $? > $@
 
+.ENDIF # DISABLE_PYTHON != TRUE