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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Oct 30 08:24:31 PDT 2012


 libxmlsec/makefile.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d34c069e699faf6e81c514091f4c812ca1063abb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 30 15:23:47 2012 +0000

    make that mingw suffix patch mingw only
    
    Change-Id: I5a8dc6ddc620bf4a4bdccfb17ffbf1155fa53987

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index ed86834..0945f2d 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -70,13 +70,16 @@ PATCH_FILES=\
    xmlsec1-customkeymanage.patch \
    xmlsec1-nssmangleciphers.patch \
    xmlsec1-noverify.patch \
-   xmlsec1-mingw32.patch \
    xmlsec1-mingw-keymgr-mscrypto.patch \
    xmlsec1-vc10.patch \
    xmlsec1-1.2.14_fix_extern_c.patch \
    xmlsec1-android.patch \
    xmlsec1-1.2.14-ansi.patch
 
+.IF "$(GUI)$(COM)"=="WNTGCC"
+   PATCH_FILES+=xmlsec1-mingw32.patch
+.ENDIF
+
 .IF "$(OS)$(CPU)"=="MACOSXP"
 PATCH_FILES+=xmlsec1-1.2.14_old_automake.patch
 EXTRA_LINKFLAGS+=-Wl,-dylib_file, at executable_path/libnssutil3.dylib:$(SOLARLIBDIR)/libnssutil3.dylib


More information about the Libreoffice-commits mailing list