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

Caolán McNamara caolan at kemper.freedesktop.org
Tue Aug 23 03:36:37 PDT 2011


 libxml2/makefile.mk |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 36481d72e1f251df53a036b477c7e3f0881f357a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 23 11:35:28 2011 +0100

    fix build error for the moment, apply mingw patch only for mingw case

diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 5c83288..8494d16 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -49,16 +49,17 @@ TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
 
 # libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
 PATCH_FILES=libxml2-configure.patch \
-            libxml2-mingw.patch \
             libxml2-gnome599717.patch \
             libxml2-xpath.patch \
             libxml2-global-symbols.patch \
             libxml2-aix.patch \
-            libxml2-vc10.patch \
-            libxml2-mingw.patch
+            libxml2-vc10.patch
 
 .IF "$(OS)" == "WNT"
 PATCH_FILES+= libxml2-long-path.patch
+.IF "$(COM)"=="GCC"
+PATCH_FILES+= libxml2-mingw.patch
+.ENDIF
 .ENDIF
 
 # This is only for UNX environment now


More information about the Libreoffice-commits mailing list