diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-07-23 09:51:20 +0200 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2026-08-03 14:53:50 +0200 |
| commit | c765eca1fbbfde6165d5ed5e56276878b3496c77 (patch) | |
| tree | 5b9ef6e90361595b70fb6076d92bc41b7c6b7abc /patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch | |
| parent | 5952bef2ec01b0b7e57c11613cbdc081dcd727c5 (diff) | |
use FCMP branch, bump simplybs, rebase patchescyjan-fcmp-v2
Diffstat (limited to 'patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch')
| -rw-r--r-- | patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch b/patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch index 84b4b99..3baf893 100644 --- a/patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch +++ b/patches/monero/0018-depends-remove-icu4c-monero-project-monero-8880.patch @@ -1,23 +1,24 @@ -From 960a5efe59725eab4c03ce8025de8fc0fbffaacf Mon Sep 17 00:00:00 2001 +From 4fa4cfd3bab65138532ca1a69ecee00baf93de35 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto <cyjan@mrcyjanek.net> Date: Tue, 3 Mar 2026 13:55:59 +0100 -Subject: [PATCH 18/20] depends: remove icu4c monero-project/monero#8880 +Subject: [PATCH 18/22] depends: remove icu4c monero-project/monero#8880 --- - CMakeLists.txt | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) + CMakeLists.txt | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ce5e1b557..25e034301 100644 +index ccb2c34dc..cbc67f9fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1117,20 +1117,15 @@ if(MINGW) +@@ -981,19 +981,16 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) + if(MINGW) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj") set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi;crypt32;bcrypt) - if(DEPENDS) -- set(ICU_LIBRARIES icuio icui18n icuuc icudata icutu iconv) +- if(NOT DEPENDS) ++ if(DEPENDS) + set(ICU_LIBRARIES iconv) - else() ++ else() # This is an extremely ugly hack to get around Boost not being built with static ICU. # We reported the issue, we are waiting for upstream to fix this issue: https://github.com/boostorg/boost/issues/1079#issue-3384962885 # This hack links shared ICU libs to avoid linker errors we get in MSYS2 compilation (undefined symbols to ICU). @@ -35,5 +36,5 @@ index ce5e1b557..25e034301 100644 endif() elseif(APPLE OR OPENBSD OR ANDROID) -- -2.50.1 (Apple Git-155) +2.54.0 (Apple Git-157) |