diff options
| author | Mateusz Franik <47059999+Im-Beast@users.noreply.github.com> | 2024-12-19 13:19:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-19 13:19:33 +0100 |
| commit | 10c0df93ff92c2001ed5aa2b22e5db85ab91242e (patch) | |
| tree | c08ce2f21126bd956b118aa4908d9a69d79b3e7f /patches/monero/0014-include-locale-only-when-targeting-WIN32.patch | |
| parent | 7d8db85942194fc7576d58beb7a4dc65e415a56b (diff) | |
| parent | 2a38bf29618a8ce163f9d6f83b7ae86924752e32 (diff) | |
Merge branch 'develop' into tests-other-platforms
Diffstat (limited to 'patches/monero/0014-include-locale-only-when-targeting-WIN32.patch')
| -rw-r--r-- | patches/monero/0014-include-locale-only-when-targeting-WIN32.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch b/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch new file mode 100644 index 0000000..4cd1d0c --- /dev/null +++ b/patches/monero/0014-include-locale-only-when-targeting-WIN32.patch @@ -0,0 +1,43 @@ +From dfe8fde34cd51f5d5ec95fb464737f6e447d41bb Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto <cyjan@mrcyjanek.net> +Date: Mon, 18 Nov 2024 10:57:37 -0500 +Subject: [PATCH 14/14] include locale only when targeting WIN32 + +--- + CMakeLists.txt | 5 ++++- + src/wallet/api/wallet.cpp | 2 ++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4e86328..809bce6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1079,7 +1079,10 @@ if(STATIC) + set(Boost_USE_STATIC_LIBS ON) + set(Boost_USE_STATIC_RUNTIME ON) + endif() +-find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale) ++if(WIN32) ++ set(BOOST_LOCALE locale) ++endif() ++find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options ${BOOST_LOCALE}) + add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION) + + set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_LIB_SUFFIXES}) +diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp +index 5734aff..f4fb093 100644 +--- a/src/wallet/api/wallet.cpp ++++ b/src/wallet/api/wallet.cpp +@@ -46,7 +46,9 @@ + #include <sstream> + #include <unordered_map> + ++#ifdef WIN32 + #include <boost/locale.hpp> ++#endif + #include <boost/filesystem.hpp> + #include "bc-ur/src/bc-ur.hpp" + #if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI) +-- +2.39.5 (Apple Git-154) + |