diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-30 15:17:40 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-30 15:25:21 +0100 |
| commit | 0afd117a2598c1cdc4efd7952fefbfbceee67dd3 (patch) | |
| tree | 17474af231ef593bd410b4afefdfbb6d846ac2a9 | |
| parent | 5644397e44833ec43362c2d36d308c80bce8116f (diff) | |
fix mingw cross-compilation of libxmlsec
It works on Fedora 17 with internal nss, at least :-)
It would be nice to clean up the patch and throw away all the crack
related to cross-compilation on Windows, but I am really not much
interested in that. Also, I am lazy .-)
Change-Id: I008e13b0c4eef9cef361af058e1f32deada8e2aa
| -rw-r--r-- | libxmlsec/makefile.mk | 19 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-mingw32.patch | 9 |
2 files changed, 17 insertions, 11 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 2a8ac0f0b748..ed8683457767 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -116,23 +116,18 @@ CONF_ILIB=-L$(ILIB:s/;/ -L/) CONFIGURE_DIR= CONFIGURE_ACTION=autoreconf ; ./configure -.IF "$(CROSS_COMPILING)"=="YES" BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT) OBJDUMP="$(OBJDUMP)" -.ELSE -BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32 --with-mozilla_ver=1.7.5 --enable-mscrypto OBJDUMP="$(WRAPCMD) objdump" -.ENDIF - -# Note that this is obsolete crack for building *locally* on Windows with MinGW, -# something we don't see the point in here in LibreOffice CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --disable-crypto-dl $(BUILD_AND_HOST) CC="$(xmlsec_CC)" LDFLAGS="-Wl,--no-undefined $(CONF_ILIB)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB="$(LIBXML2LIB)" ZLIB3RDLIB=$(ZLIB3RDLIB) .IF "$(SYSTEM_NSS)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no .ENDIF -BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) +BUILD_ACTION=$(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM) BUILD_DIR=$(CONFIGURE_DIR) -.ELSE + +.ELSE # "$(COM)"!="GCC" + CONFIGURE_DIR=win32 CONFIGURE_ACTION=cscript configure.js .IF "$(product)"!="full" && "$(CCNUMVER)" >= "001399999999" @@ -142,8 +137,10 @@ CONFIGURE_FLAGS=crypto=$(CRYPTOLIB) xslt=no iconv=no static=no include=$(BASEINC .ENDIF BUILD_ACTION=nmake BUILD_DIR=$(CONFIGURE_DIR) -.ENDIF -.ELSE +.ENDIF # "$(COM)"=="GCC" + +.ELSE # "$(OS)"!="WNT" + .IF "$(GUI)"=="UNX" .IF "$(COM)"=="C52" && "$(CPU)"=="U" diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch index a5012ca53082..8aa864416cf4 100644 --- a/libxmlsec/xmlsec1-mingw32.patch +++ b/libxmlsec/xmlsec1-mingw32.patch @@ -1,5 +1,14 @@ --- misc/xmlsec1-1.2.14/configure.in 2009-09-29 15:55:33.282288142 +0200 +++ misc/build/xmlsec1-1.2.14/configure.in 2009-09-29 15:49:39.614223428 +0200 +@@ -33,6 +33,8 @@ + AC_HEADER_STDC + + LT_INIT ++dnl force the right implib extension for mingw ++libext=dll.a + + dnl + dnl Find programs @@ -671,7 +671,9 @@ done |