2a38bf2961
* cleanup patches
* fix polyseed patch
* Fix iOS builds
* fix polyseed dependencies
* fix polyseed patch for macOS
* update ledger patch
* update wownero patches and version
* update checksums
* wip"
* update gitmodules
* update boost build script
* update build_single.sh
* vix verbosey_copy
* fix __clear_cache bug on wownero
* update randomwow
* migrate build system
* fix cross compilation issues
* some more build issue
* update polyseed
* cleanup cmakelists
* fix toolchain.cmake.in
* add ssp
* another attempt at building windows on CI
* fix package name
* migrate mirror to my own hosting
* change download mirror priority (fallback first)
* link ssp in monero module as well by using CMAKE_{C,CXX}_FLAGS
* fix android builds
* update polyseed source
* 13 -> trixie
* fix package name conflicts, update runner to sid
* update boost to 1_84_0, disable patch that's no longer needed
* switch to ubuntu:24.04
* add POLYSEED_STATIC to toolchain.cmake.in in order to properly link
* drop patches
* fixes to darwin
* link missing wowner-seed library
* a litte bit more of experiments
* build locale only on windows
* update iconv
* update definitions
* update ci builds
* update my progress
* ios fix, update depends, ci
* multithread build system
* fix android, mingw and linux build issues
* remove dependency check
* update Dockerfile to include pigz
* show a message when pigz is missing
* fix devcontainer mingw setup (missing ENV)
* update android build runner
* sailfishos dropped (you better go behave yourself and run actual linux programs)
* fiz pigz issues
* install llvm-ranlib for android
* fix iOS build issues
* fix dummy ledger patch
* fix macos and darwin
* fix macos ci
* fix macos build command
* install autoconf
* add automake
* add libtool
* macos fixes, wownero fixes, idk what else, please help me
* fix wownero iOS build
* Cleanup patches
* add try-catch into monero code
* fix error handling
* update checksums
105 lines
3.7 KiB
Diff
105 lines
3.7 KiB
Diff
From dcb483e5cb97c4e3c500355d8225bd49d3e0ae7f Mon Sep 17 00:00:00 2001
|
|
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
|
|
Date: Thu, 21 Nov 2024 06:05:03 -0500
|
|
Subject: [PATCH 13/14] fix iOS depends build
|
|
|
|
---
|
|
CMakeLists.txt | 4 ----
|
|
src/checkpoints/CMakeLists.txt | 6 +++++-
|
|
src/cryptonote_basic/CMakeLists.txt | 6 +++++-
|
|
src/cryptonote_basic/miner.cpp | 8 ++++----
|
|
4 files changed, 14 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b995a68..4e86328 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -39,10 +39,6 @@ include(CheckLibraryExists)
|
|
include(CheckFunctionExists)
|
|
include(FindPythonInterp)
|
|
|
|
-if (IOS)
|
|
- INCLUDE(CmakeLists_IOS.txt)
|
|
-endif()
|
|
-
|
|
cmake_minimum_required(VERSION 3.5)
|
|
message(STATUS "CMake version ${CMAKE_VERSION}")
|
|
|
|
diff --git a/src/checkpoints/CMakeLists.txt b/src/checkpoints/CMakeLists.txt
|
|
index 665441f..841df32 100644
|
|
--- a/src/checkpoints/CMakeLists.txt
|
|
+++ b/src/checkpoints/CMakeLists.txt
|
|
@@ -28,7 +28,11 @@
|
|
|
|
if(APPLE)
|
|
if(DEPENDS)
|
|
- list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework ApplicationServices -framework AppKit -framework IOKit")
|
|
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
|
+ list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
|
|
+ else()
|
|
+ list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework ApplicationServices -framework AppKit -framework IOKit")
|
|
+ endif()
|
|
else()
|
|
find_library(IOKIT_LIBRARY IOKit)
|
|
mark_as_advanced(IOKIT_LIBRARY)
|
|
diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt
|
|
index 414936a..81c8176 100644
|
|
--- a/src/cryptonote_basic/CMakeLists.txt
|
|
+++ b/src/cryptonote_basic/CMakeLists.txt
|
|
@@ -28,7 +28,11 @@
|
|
|
|
if(APPLE)
|
|
if(DEPENDS)
|
|
- list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework ApplicationServices -framework AppKit -framework IOKit")
|
|
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
|
+ list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
|
|
+ else()
|
|
+ list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework ApplicationServices -framework AppKit -framework IOKit")
|
|
+ endif()
|
|
else()
|
|
find_library(IOKIT_LIBRARY IOKit)
|
|
mark_as_advanced(IOKIT_LIBRARY)
|
|
diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp
|
|
index 71b8f78..0f53f02 100644
|
|
--- a/src/cryptonote_basic/miner.cpp
|
|
+++ b/src/cryptonote_basic/miner.cpp
|
|
@@ -45,7 +45,7 @@
|
|
#include "boost/logic/tribool.hpp"
|
|
#include <boost/filesystem.hpp>
|
|
|
|
-#ifdef __APPLE__
|
|
+#if defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
|
|
#include <sys/times.h>
|
|
#include <IOKit/IOKitLib.h>
|
|
#include <IOKit/ps/IOPSKeys.h>
|
|
@@ -883,7 +883,7 @@ namespace cryptonote
|
|
|
|
return true;
|
|
|
|
- #elif defined(__APPLE__)
|
|
+ #elif defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
|
|
|
|
mach_msg_type_number_t count;
|
|
kern_return_t status;
|
|
@@ -949,7 +949,7 @@ namespace cryptonote
|
|
return true;
|
|
}
|
|
|
|
- #elif (defined(__linux__) && defined(_SC_CLK_TCK)) || defined(__APPLE__) || defined(__FreeBSD__)
|
|
+ #elif (defined(__linux__) && defined(_SC_CLK_TCK)) || (defined(__APPLE__) && !defined(TARGET_OS_IPHONE)) || defined(__FreeBSD__)
|
|
|
|
struct tms tms;
|
|
if ( times(&tms) != (clock_t)-1 )
|
|
@@ -978,7 +978,7 @@ namespace cryptonote
|
|
return boost::logic::tribool(power_status.ACLineStatus != 1);
|
|
}
|
|
|
|
- #elif defined(__APPLE__)
|
|
+ #elif defined(__APPLE__) && !defined(TARGET_OS_IPHONE)
|
|
|
|
#if TARGET_OS_MAC && (!defined(MAC_OS_X_VERSION_MIN_REQUIRED) || MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)
|
|
return boost::logic::tribool(IOPSGetTimeRemainingEstimate() != kIOPSTimeRemainingUnlimited);
|
|
--
|
|
2.39.5 (Apple Git-154)
|
|
|