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

[Jan Holesovsky]

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

New commits:
commit b0eea6c310e187af5b9580a29d0f25c320fbc190
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Aug 23 11:27:40 2011 +0200

    Fix cross-building libxslt to at least go through configure; does not build.

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 576dede..4767248 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -72,7 +72,17 @@ xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
 .ENDIF
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)"  LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
+.IF "$(CROSS_COMPILING)"=="YES"
+BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ELSE
+BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32
+.ENDIF
+.IF "$(ILIB)" == ""
+CONF_ILIB=
+.ELSE
+CONF_ILIB=-L$(ILIB:s/;/ -L/)
+.ENDIF
+CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no $(BUILD_AND_HOST) CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 $(CONF_ILIB)" LIBS="$(xslt_LIBS)"  LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
 BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)