mirror of https://git.wownero.com/dsc/mxe.git
124 lines
3.7 KiB
Diff
124 lines
3.7 KiB
Diff
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: Boris Nagaev <bnagaev@gmail.com>
|
|
Date: Sat, 1 Apr 2017 15:17:43 +0200
|
|
Subject: [PATCH 1/3] Wt fixes
|
|
|
|
|
|
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
|
|
index 1111111..2222222 100644
|
|
--- a/cmake/WtFindBoost-vintage.txt
|
|
+++ b/cmake/WtFindBoost-vintage.txt
|
|
@@ -70,6 +70,7 @@ ELSE(MSVC)
|
|
boost_thread-${BOOST_COMPILER}-mt-${BOOST_FLAGS}-${BOOST_VERSION}
|
|
boost_thread-${BOOST_COMPILER}-mt-${BOOST_VERSION}
|
|
boost_thread-${BOOST_COMPILER}-mt
|
|
+ boost_thread${BOOST_COMPILER}-mt
|
|
boost_thread-mt-${BOOST_VERSION}
|
|
boost_thread-mt
|
|
boost_thread-${BOOST_COMPILER}-${BOOST_VERSION}
|
|
diff --git a/cmake/WtFindGm.txt b/cmake/WtFindGm.txt
|
|
index 1111111..2222222 100644
|
|
--- a/cmake/WtFindGm.txt
|
|
+++ b/cmake/WtFindGm.txt
|
|
@@ -59,6 +59,12 @@ IF(WIN32)
|
|
ELSE(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
|
|
SET(GM_FOUND FALSE)
|
|
ENDIF(GM_LIB AND GMPP_LIB AND GM_LIB_DEBUG AND GMPP_LIB_DEBUG AND GM_INCLUDE_DIR)
|
|
+
|
|
+ IF(GM_INCLUDE_DIR AND GM_LIBS)
|
|
+ SET(GM_FOUND TRUE)
|
|
+ SET(GM_INCLUDE_DIRS ${GM_INCLUDE_DIR})
|
|
+ SET(GM_LIBRARIES optimized ${GM_LIBS})
|
|
+ ENDIF(GM_INCLUDE_DIR AND GM_LIBS)
|
|
ELSE(WIN32)
|
|
FIND_LIBRARY(GM_LIB
|
|
NAMES
|
|
diff --git a/cmake/WtFindPangoFt2.txt b/cmake/WtFindPangoFt2.txt
|
|
index 1111111..2222222 100644
|
|
--- a/cmake/WtFindPangoFt2.txt
|
|
+++ b/cmake/WtFindPangoFt2.txt
|
|
@@ -43,13 +43,17 @@ SET(PANGO_FT2_INCLUDE_DIRS
|
|
${GLIB2_INCLUDE_DIR}
|
|
${GLIB2_CONFIG_INCLUDE_DIR})
|
|
|
|
-SET(PANGO_FT2_LIBRARIES
|
|
- ${PANGO_FT2_LIBRARY}
|
|
- ${PANGO_LIBRARY}
|
|
- ${GOBJECT2_LIBRARY}
|
|
- ${GLIB2_LIBRARY}
|
|
- ${FONTCONFIG_LIBRARY}
|
|
- )
|
|
+IF(PANGO_FT2_LIBS)
|
|
+ SET(PANGO_FT2_LIBRARIES optimized ${PANGO_FT2_LIBS})
|
|
+ELSE(PANGO_FT2_LIBS)
|
|
+ SET(PANGO_FT2_LIBRARIES
|
|
+ ${PANGO_FT2_LIBRARY}
|
|
+ ${PANGO_LIBRARY}
|
|
+ ${GOBJECT2_LIBRARY}
|
|
+ ${GLIB2_LIBRARY}
|
|
+ ${FONTCONFIG_LIBRARY}
|
|
+ )
|
|
+ENDIF(PANGO_FT2_LIBS)
|
|
|
|
IF (PANGO_INCLUDE_DIR
|
|
AND FT2_INCLUDE_DIR
|
|
diff --git a/cmake/WtFindSsl.txt b/cmake/WtFindSsl.txt
|
|
index 1111111..2222222 100644
|
|
--- a/cmake/WtFindSsl.txt
|
|
+++ b/cmake/WtFindSsl.txt
|
|
@@ -110,6 +110,11 @@ IF(WIN32)
|
|
AND SSL_LIB_DEBUG
|
|
AND SSL_TOO_LIB_RELEASE
|
|
AND SSL_TOO_LIB_DEBUG)
|
|
+
|
|
+ IF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
|
|
+ SET(SSL_FOUND true)
|
|
+ SET(SSL_LIBRARIES optimized ${OPENSSL_LIBS})
|
|
+ ENDIF(SSL_INCLUDE_DIRS AND OPENSSL_LIBS)
|
|
ELSEIF(APPLE)
|
|
FIND_LIBRARY(SSL_LIB
|
|
NAMES
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Wed, 15 Aug 2018 13:28:31 +1000
|
|
Subject: [PATCH 2/3] fix w32 build posix threads enabled
|
|
|
|
|
|
diff --git a/src/http/Reply.C b/src/http/Reply.C
|
|
index 1111111..2222222 100644
|
|
--- a/src/http/Reply.C
|
|
+++ b/src/http/Reply.C
|
|
@@ -23,7 +23,7 @@
|
|
#include <string>
|
|
#include <boost/lexical_cast.hpp>
|
|
|
|
-#ifdef WT_WIN32
|
|
+#if defined(WT_WIN32) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
|
|
// gmtime_r can be defined by mingw
|
|
#ifndef gmtime_r
|
|
static struct tm* gmtime_r(const time_t* t, struct tm* r)
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Mark Brand <mabrand@mabrand.nl>
|
|
Date: Mon, 17 Sep 2018 23:31:42 +0200
|
|
Subject: [PATCH 3/3] fix missing gmtime_r definition
|
|
|
|
|
|
diff --git a/src/http/Reply.C b/src/http/Reply.C
|
|
index 1111111..2222222 100644
|
|
--- a/src/http/Reply.C
|
|
+++ b/src/http/Reply.C
|
|
@@ -13,6 +13,7 @@
|
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
//
|
|
|
|
+#include <unistd.h>
|
|
#include "Configuration.h"
|
|
#include "Connection.h"
|
|
#include "Reply.h"
|