Mark Brand
5 years ago
parent
24975c015d
commit
0fd68471f3
@ -0,0 +1,56 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Herkt <lachs0r@srsfckn.biz>
|
||||
Date: Fri, 3 May 2019 21:26:06 +0200
|
||||
Subject: [PATCH 1/2] Fix MinGW build on case-sensitive filesystems
|
||||
|
||||
|
||||
diff --git a/lib/zip_crypto_win.c b/lib/zip_crypto_win.c
|
||||
index 1111111..2222222 100644
|
||||
--- a/lib/zip_crypto_win.c
|
||||
+++ b/lib/zip_crypto_win.c
|
||||
@@ -39,7 +39,7 @@
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOCRYPT
|
||||
|
||||
-#include <Windows.h>
|
||||
+#include <windows.h>
|
||||
#include <bcrypt.h>
|
||||
|
||||
#pragma comment(lib, "bcrypt.lib")
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Herkt <lachs0r@srsfckn.biz>
|
||||
Date: Fri, 3 May 2019 23:39:11 +0200
|
||||
Subject: [PATCH 2/2] Fix pkg-config Libs.private for static linking
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -299,13 +299,17 @@ SET(exec_prefix \${prefix})
|
||||
SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR})
|
||||
SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
|
||||
SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
|
||||
-IF(BZIP2_FOUND)
|
||||
- SET(LIBS "${LIBS} -lbz2")
|
||||
-ENDIF()
|
||||
-SET(LIBS "${LIBS} -lz")
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES BSD)
|
||||
SET(PKG_CONFIG_RPATH "-Wl,-R\${libdir}")
|
||||
ENDIF(CMAKE_SYSTEM_NAME MATCHES BSD)
|
||||
+get_target_property(LIBS_PRIVATE zip LINK_LIBRARIES)
|
||||
+foreach(LIB ${LIBS_PRIVATE})
|
||||
+ if(LIB MATCHES "^/")
|
||||
+ get_filename_component(LIB ${LIB} NAME_WE)
|
||||
+ string(REGEX REPLACE "^lib" "" LIB ${LIB})
|
||||
+ endif()
|
||||
+ set(LIBS "${LIBS} -l${LIB}")
|
||||
+endforeach()
|
||||
CONFIGURE_FILE(libzip.pc.in libzip.pc @ONLY)
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sat, 7 Apr 2018 14:43:45 +1000
|
||||
Subject: [PATCH 1/1] fix static mingw builds with pkgconf
|
||||
|
||||
see:
|
||||
https://github.com/lsh123/xmlsec/pull/162
|
||||
|
||||
diff --git a/xmlsec-gcrypt.pc.in b/xmlsec-gcrypt.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/xmlsec-gcrypt.pc.in
|
||||
+++ b/xmlsec-gcrypt.pc.in
|
||||
@@ -8,4 +8,5 @@ Version: @VERSION@
|
||||
Description: XML Security Library implements XML Signature and XML Encryption standards
|
||||
Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
|
||||
Cflags: @XMLSEC_GCRYPT_CFLAGS@
|
||||
+Cflags.private: -DXMLSEC_STATIC
|
||||
Libs: @XMLSEC_GCRYPT_LIBS@
|
||||
diff --git a/xmlsec-gnutls.pc.in b/xmlsec-gnutls.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/xmlsec-gnutls.pc.in
|
||||
+++ b/xmlsec-gnutls.pc.in
|
||||
@@ -8,4 +8,5 @@ Version: @VERSION@
|
||||
Description: XML Security Library implements XML Signature and XML Encryption standards
|
||||
Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
|
||||
Cflags: @XMLSEC_GNUTLS_CFLAGS@
|
||||
+Cflags.private: -DXMLSEC_STATIC
|
||||
Libs: @XMLSEC_GNUTLS_LIBS@
|
||||
diff --git a/xmlsec-nss.pc.in b/xmlsec-nss.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/xmlsec-nss.pc.in
|
||||
+++ b/xmlsec-nss.pc.in
|
||||
@@ -8,4 +8,5 @@ Version: @VERSION@
|
||||
Description: XML Security Library implements XML Signature and XML Encryption standards
|
||||
Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@ @NSPR_PACKAGE@ >= @MOZILLA_MIN_VERSION@ @NSS_PACKAGE@ >= @MOZILLA_MIN_VERSION@
|
||||
Cflags: -DXMLSEC_CRYPTO_NSS=1 @XMLSEC_CORE_CFLAGS@
|
||||
+Cflags.private: -DXMLSEC_STATIC
|
||||
Libs: -L${libdir} -lxmlsec1-nss @XMLSEC_CORE_LIBS@
|
||||
diff --git a/xmlsec-openssl.pc.in b/xmlsec-openssl.pc.in
|
||||
index 1111111..2222222 100644
|
||||
--- a/xmlsec-openssl.pc.in
|
||||
+++ b/xmlsec-openssl.pc.in
|
||||
@@ -8,4 +8,5 @@ Version: @VERSION@
|
||||
Description: XML Security Library implements XML Signature and XML Encryption standards
|
||||
Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ @LIBXSLT_PC_FILE_COND@
|
||||
Cflags: @XMLSEC_OPENSSL_CFLAGS@
|
||||
+Cflags.private: -DXMLSEC_STATIC
|
||||
Libs: @XMLSEC_OPENSSL_LIBS@
|
||||
Loading…
Reference in new issue