diff options
| author | renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> | 2025-03-04 12:27:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 12:27:45 +0100 |
| commit | fdb16635cbfe1d45a3d5869c0a55ec871d912ea0 (patch) | |
| tree | ec6703c28b4f09c6d10f56339db78a3cdb2c8b82 /patches/zano/0005-fix-ios-builds.patch | |
| parent | 991a0d0c97bce6ae8671dc763dd03876dfa9ea8a (diff) | |
chore(deps): update zano digest to fe85ce2 (#116)
* chore(deps): update zano digest to fe85ce2
* rebase needed patches
* fix integration tests, generate checksum
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Czarek Nakamoto <cyjan@mrcyjanek.net>
Diffstat (limited to 'patches/zano/0005-fix-ios-builds.patch')
| -rw-r--r-- | patches/zano/0005-fix-ios-builds.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/patches/zano/0005-fix-ios-builds.patch b/patches/zano/0005-fix-ios-builds.patch deleted file mode 100644 index f68244f..0000000 --- a/patches/zano/0005-fix-ios-builds.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 20975fed75b7255f6cb6df74a17f1923f7159c09 Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto <cyjan@mrcyjanek.net> -Date: Tue, 5 Nov 2024 16:52:23 +0100 -Subject: [PATCH 5/5] fix ios builds - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c480300f..7087d796 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -136,6 +136,8 @@ else() - set(ARCH default CACHE STRING "CPU to build for: -march value or default") - if("${ARCH}" STREQUAL "default") - set(ARCH_FLAG "") -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") -+ set(ARCH_FLAG "") - else() - set(ARCH_FLAG "-march=${ARCH}") - endif() -@@ -207,7 +209,7 @@ else() - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${RELEASE_FLAGS}") - if(STATIC) - if(APPLE) -- message(SEND_ERROR "Static build is not supported on MacOS X") -+ message("Static build is not supported on MacOS X") - else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") - endif() -@@ -260,8 +262,6 @@ else() - find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale log) - endif() - -- -- - message(STATUS "Boost: ${Boost_VERSION} from ${Boost_LIBRARY_DIRS}") - - --- -2.39.5 (Apple Git-154) - |
