diff options
Diffstat (limited to 'external/libxmlsec')
| -rw-r--r-- | external/libxmlsec/ExternalProject_xmlsec.mk | 16 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-configure.patch.1 | 2 | ||||
| -rw-r--r-- | external/libxmlsec/xmlsec1-customkeymanage.patch.1 | 6 |
3 files changed, 2 insertions, 22 deletions
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 31708c4577ba..66abd02ac3a5 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -21,21 +21,6 @@ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(call gb_ExternalProject_get_state_target,xmlsec,build) : - $(call gb_ExternalProject_run,build,\ - autoreconf \ - && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ - $(if $(SYSTEM_NSS),,--disable-pkgconfig) \ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \ - LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED__LIBSTDCPP))" \ - lt_cv_deplibs_check_method=pass_all \ - && $(MAKE) \ - ) - -else $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \ @@ -44,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) -endif else diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/libxmlsec/xmlsec1-configure.patch.1 index 2b496d7ee9fd..e114012ab602 100644 --- a/external/libxmlsec/xmlsec1-configure.patch.1 +++ b/external/libxmlsec/xmlsec1-configure.patch.1 @@ -88,7 +88,7 @@ index b8770ad..721e4ca 100644 -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" + +case $host_os in -+cygwin* | mingw* | pw32*) ++cygwin* | pw32*) + NSS_LIBS_LIST="-lnss3 -lsmime3" + NSPR_LIBS_LIST="-lnspr4" + ;; diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 index 226d6c0394a1..2a5f15fecf4f 100644 --- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 +++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 @@ -3165,7 +3165,7 @@ new file mode 100644 index 0000000..e27d1e4 --- /dev/null +++ b/src/nss/tokens.c -@@ -0,0 +1,548 @@ +@@ -0,0 +1,544 @@ +/** + * XMLSec library + * @@ -3517,11 +3517,7 @@ index 0000000..e27d1e4 +/** + * Key Slot List + */ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = { -+#else +static xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = { -+#endif + BAD_CAST "mechanism-list", + (xmlSecPtrDuplicateItemMethod)xmlSecNssKeySlotDuplicate, + (xmlSecPtrDestroyItemMethod)xmlSecNssKeySlotDestroy, |