[Libreoffice-commits] .: libxml2/makefile.mk

[Tor Lillqvist]

 libxml2/makefile.mk |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 3ca6b129d7df249c8157cf3b33e654e56586d5cd
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 24 02:29:34 2011 +0300

    Cross-compilation support and iOS in particular

diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index f037648..60a2e54 100755
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -98,13 +98,21 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+.IF "$(OS)"=="IOS"
+CONFIGURE_FLAGS+=--disable-shared
+.ELSE
+CONFIGURE_FLAGS=--disable-static
+.ENDIF
+CONFIGURE_FLAGS+=--enable-ipv6=no --without-python --without-zlib --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .IF "$(debug)"!=""
 CONFIGURE_FLAGS+=--with-mem-debug --with-run-debug
 .ENDIF
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
 .ENDIF
 
 
@@ -115,6 +123,9 @@ EXTRPATH=URELIB
 OUT2LIB+=.libs$/libxml2.*.dylib
 OUT2BIN+=.libs$/xmllint
 OUT2BIN+=xml2-config
+.ELIF "$(OS)"=="IOS"
+OUT2LIB+=.libs$/libxml2.a
+OUT2BIN+=xml2-config
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OUT2LIB+=.libs$/libxml2*.a