diff options
| author | cyan <cyjan@mrcyjanek.net> | 2025-01-04 09:02:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-04 09:02:44 +0100 |
| commit | fcc2924f31e6ecc1ad787ab6c704188c393318aa (patch) | |
| tree | 1e43e28bd5556334b0b37068fd3ea97916f50add /patches/zano/0003-fix-mingw-build-issues.patch | |
| parent | a6134fcebc9928b8a1e90623b136e4e4a309fc64 (diff) | |
initial zano commit (#83)
* initial zano commit
* update checksum, fix zano patches on CI
* fix monero builds
* fix cmake command
* fix: devcontainer on x64
ffigen: add zano
zano: add missing free
dart: implement zano
* update boost filenames
* unboost the cmakelists
* fix zano boost issues
* added patch into proper location
* fix various build issues
* [skip ci] update tor-connect
* fix zano builds for ios
* fix apply patches and don't fail-fast
* uncomment build depends for monero
* build_single.sh fix for macos native builds
* disable qemu on arm64 builders from buildjet
* fix boost, fix missing symbols (maybe)
* fix ordering of crypto and ssl libraries
* fix wownero mingw
* fetch zano releases to release-bulk
* build things 'the zano way'
* proper cmake config
* Zano.. yeah...
* Update zano release to 2.0.1.367
* update zano patches
* update zano builds
* update zano build
* fix zano build
* move zlibstatic to the top (this shouldn't matter anyway)
* fix patch location, update tor-connect
* update ci runner
* fix zano build on the CI
* enable zano for other targets
* nvm
* don't use darwin in single release file
* Increase max password length
* build contrib/depends offline
* zano support for macos
* Update dependencies to work on multithread via rosetta2
* different way of adding .patch-applied
* Improve performance of incremental builds
* remove unnecessary patches
* update coin-control patch
* fix test
* remove contrib/depends patches in wownero
* chore: support fallback names in the download_deps util
---------
Co-authored-by: Im-Beast <franik.mateusz@gmail.com>
Diffstat (limited to 'patches/zano/0003-fix-mingw-build-issues.patch')
| -rw-r--r-- | patches/zano/0003-fix-mingw-build-issues.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/patches/zano/0003-fix-mingw-build-issues.patch b/patches/zano/0003-fix-mingw-build-issues.patch new file mode 100644 index 0000000..48b4d65 --- /dev/null +++ b/patches/zano/0003-fix-mingw-build-issues.patch @@ -0,0 +1,61 @@ +From 1f7604d5b661f4490a1757e5ed1d6ed367ffb739 Mon Sep 17 00:00:00 2001 +From: cyan <cyjan@mrcyjanek.net> +Date: Sun, 3 Nov 2024 08:59:22 +0000 +Subject: [PATCH 3/5] fix mingw build issues + +--- + contrib/epee/include/misc_os_dependent.h | 4 ++-- + src/common/callstack_helper.cpp | 2 +- + src/crypto/ecrypt-config.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/contrib/epee/include/misc_os_dependent.h b/contrib/epee/include/misc_os_dependent.h +index c06e5d94..a2a979b9 100644 +--- a/contrib/epee/include/misc_os_dependent.h ++++ b/contrib/epee/include/misc_os_dependent.h +@@ -110,14 +110,14 @@ namespace misc_utils + } + + +-#if defined(__GNUC__) && !defined(__ANDROID__) ++#if defined(__GNUC__) && !defined(__ANDROID__) && !defined(_WIN32) + #include <execinfo.h> + #include <boost/core/demangle.hpp> + #endif + inline std::string print_trace_default() + { + std::stringstream ss; +-#if defined(__GNUC__) && !defined(__ANDROID__) ++#if defined(__GNUC__) && !defined(__ANDROID__) && !defined(_WIN32) + ss << std::endl << "STACK" << std::endl; + const size_t max_depth = 100; + size_t stack_depth; +diff --git a/src/common/callstack_helper.cpp b/src/common/callstack_helper.cpp +index b84fe5a8..c9eae839 100644 +--- a/src/common/callstack_helper.cpp ++++ b/src/common/callstack_helper.cpp +@@ -9,7 +9,7 @@ + #define NOMINMAX + #endif + #include <windows.h> +-#include <Psapi.h> ++#include <psapi.h> + #pragma comment(lib, "psapi.lib") + #pragma comment(lib, "dbghelp.lib") + +diff --git a/src/crypto/ecrypt-config.h b/src/crypto/ecrypt-config.h +index 9176de17..8b488135 100644 +--- a/src/crypto/ecrypt-config.h ++++ b/src/crypto/ecrypt-config.h +@@ -257,7 +257,7 @@ + + #ifdef _UI64_MAX + +-#if (_UI64_MAX / 0xFFFFFFFFui64 > 0xFFFFFFFFui64) ++#if (_UI64_MAX / 0xFFFFFFFF > 0xFFFFFFFF) + #ifndef I64T + #define I64T __int64 + #define U64C(v) (v##ui64) +-- +2.39.5 (Apple Git-154) + |
