Kaydet (Commit) 0afd117a authored tarafından David Tardon's avatar David Tardon

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
üst 5644397e
...@@ -116,23 +116,18 @@ CONF_ILIB=-L$(ILIB:s/;/ -L/) ...@@ -116,23 +116,18 @@ CONF_ILIB=-L$(ILIB:s/;/ -L/)
CONFIGURE_DIR= CONFIGURE_DIR=
CONFIGURE_ACTION=autoreconf ; ./configure CONFIGURE_ACTION=autoreconf ; ./configure
.IF "$(CROSS_COMPILING)"=="YES"
BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) MINGW_SYSROOT=$(MINGW_SYSROOT) OBJDUMP="$(OBJDUMP)" 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) 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" .IF "$(SYSTEM_NSS)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF .ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_ACTION=$(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
.ELSE # "$(COM)"!="GCC"
CONFIGURE_DIR=win32 CONFIGURE_DIR=win32
CONFIGURE_ACTION=cscript configure.js CONFIGURE_ACTION=cscript configure.js
.IF "$(product)"!="full" && "$(CCNUMVER)" >= "001399999999" .IF "$(product)"!="full" && "$(CCNUMVER)" >= "001399999999"
...@@ -142,8 +137,10 @@ CONFIGURE_FLAGS=crypto=$(CRYPTOLIB) xslt=no iconv=no static=no include=$(BASEINC ...@@ -142,8 +137,10 @@ CONFIGURE_FLAGS=crypto=$(CRYPTOLIB) xslt=no iconv=no static=no include=$(BASEINC
.ENDIF .ENDIF
BUILD_ACTION=nmake BUILD_ACTION=nmake
BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR=$(CONFIGURE_DIR)
.ENDIF .ENDIF # "$(COM)"=="GCC"
.ELSE
.ELSE # "$(OS)"!="WNT"
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
.IF "$(COM)"=="C52" && "$(CPU)"=="U" .IF "$(COM)"=="C52" && "$(CPU)"=="U"
......
--- misc/xmlsec1-1.2.14/configure.in 2009-09-29 15:55:33.282288142 +0200 --- 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 +++ 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 @@ @@ -671,7 +671,9 @@
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment