summaryrefslogtreecommitdiff
path: root/patches/monero/0011-add-monero-submodule-support.patch
diff options
context:
space:
mode:
authorcyan <cyjan@mrcyjanek.net>2026-03-09 18:05:16 +0100
committerGitHub <noreply@github.com>2026-03-09 18:05:16 +0100
commit2c11591e02b907e63d8fd4fcb0a6559625934a95 (patch)
treedab95d36703f314a8ee9d6277a160df16833c4e5 /patches/monero/0011-add-monero-submodule-support.patch
parent411e8a1cdb3f4c2812d83f28c335d2a4eb18bd29 (diff)
reproducibility (#177)
* reproducibility * wip: ci fixes, drop generate_translations_header.c * minor fixes * fix patch * fix: toolchain * bump hash * fix: minor build issue fixes * fix: x86_64-w64-mingw32 * wip * wip * all updated :o * fix: reduce git size * update checksum remove CI * chore, more optimal dockerfile * update monero to v0.18.4.6 * update checksum * update * minor patch update * fix: no command specified * fix: correct path * alpine * stupid. * AAWASTREYDRFUGTIHYJHGUTYFRDTFYVGUBHINJHGTYFRDSRTXDTCFHBJ
Diffstat (limited to 'patches/monero/0011-add-monero-submodule-support.patch')
-rw-r--r--patches/monero/0011-add-monero-submodule-support.patch59
1 files changed, 36 insertions, 23 deletions
diff --git a/patches/monero/0011-add-monero-submodule-support.patch b/patches/monero/0011-add-monero-submodule-support.patch
index 413aaba..fee1fba 100644
--- a/patches/monero/0011-add-monero-submodule-support.patch
+++ b/patches/monero/0011-add-monero-submodule-support.patch
@@ -1,20 +1,28 @@
-From ec93b6bf725eeff0999fdd9d603c4578cb19ae07 Mon Sep 17 00:00:00 2001
+From e06b0e86b6b6204bf20c0caadde64da1f0966da1 Mon Sep 17 00:00:00 2001
From: cyan <cyjan@mrcyjanek.net>
Date: Thu, 7 Nov 2024 16:46:24 +0000
-Subject: [PATCH 11/17] add monero submodule support
+Subject: [PATCH 11/20] add monero submodule support
---
- CMakeLists.txt | 6 +++---
- cmake/CheckLinkerFlag.cmake | 2 +-
- src/wallet/wallet_rpc_server.cpp | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ CMakeLists.txt | 12 ++++++------
+ src/wallet/wallet_rpc_server.cpp | 2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0630ef9b..9406e57b4 100644
+index 390339523..d0af390d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -75,7 +75,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.0.0" AND CMAKE_MAKE_PROGRAM MATCHES "nin
+ set(CMAKE_JOB_POOL_LINK link_job_pool)
+ endif ()
+ endif ()
+-
++
+ option (USE_CLANG_TIDY_C "Lint the code with clang-tidy - variant C" OFF)
+ option (USE_CLANG_TIDY_CXX "Lint the code with clang-tidy - variant C++" OFF)
+ if (USE_CLANG_TIDY_C AND USE_CLANG_TIDY_CXX)
@@ -223,9 +223,9 @@ function(forbid_undefined_symbols)
- cmake_minimum_required(VERSION 3.1)
+ cmake_minimum_required(VERSION 3.5)
project(test)
option(EXPECT_SUCCESS "" ON)
-file(WRITE "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
@@ -25,6 +33,15 @@ index f0630ef9b..9406e57b4 100644
endif()
add_library(l0 SHARED incorrect_source.cpp)
add_library(l1 MODULE incorrect_source.cpp)
+@@ -363,7 +363,7 @@ if(NOT MANUAL_SUBMODULES)
+ message(FATAL_ERROR "Submodule '${relative_path}' is not up-to-date. Please update all submodules with\ngit submodule update --init --force\nor run cmake with -DMANUAL_SUBMODULES=1\n")
+ endif()
+ endfunction ()
+-
++
+ message(STATUS "Checking submodules")
+ # check_submodule(external/bc-ur)
+ check_submodule(external/miniupnp)
@@ -390,7 +390,7 @@ else()
endif()
@@ -34,24 +51,20 @@ index f0630ef9b..9406e57b4 100644
if (NOT DEFINED ENV{DEVELOPER_LOCAL_TOOLS})
message(STATUS "Could not find DEVELOPER_LOCAL_TOOLS in env (not required)")
-diff --git a/cmake/CheckLinkerFlag.cmake b/cmake/CheckLinkerFlag.cmake
-index 7ecf5f610..89fb9d167 100644
---- a/cmake/CheckLinkerFlag.cmake
-+++ b/cmake/CheckLinkerFlag.cmake
-@@ -6,7 +6,7 @@ macro(CHECK_LINKER_FLAG flag VARIABLE)
- message(STATUS "Looking for ${flag} linker flag")
- endif()
+@@ -1003,7 +1003,7 @@ else()
-- set(_cle_source ${CMAKE_SOURCE_DIR}/cmake/CheckLinkerFlag.c)
-+ set(_cle_source ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CheckLinkerFlag.c)
-
- set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
- set(CMAKE_C_FLAGS "${flag}")
+ # random crash on startup when asan is on if pie is enabled
+ if(NOT SANITIZE AND ANDROID AND NOT BUILD_GUI_DEPS STREQUAL "ON" OR IOS)
+- #From Android 5: "only position independent executables (PIE) are supported"
++ #From Android 5: "only position independent executables (PIE) are supported"
+ message(STATUS "Enabling PIE executable")
+ set(PIC_FLAG "")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
-index 3188c88db..9fbdb3c05 100644
+index 0cf75a1c4..66def08ef 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
-@@ -1184,7 +1184,7 @@ namespace tools
+@@ -1261,7 +1261,7 @@ namespace tools
{
uint64_t mixin = m_wallet->adjust_mixin(req.ring_size ? req.ring_size - 1 : 0);
uint32_t priority = m_wallet->adjust_priority(req.priority);
@@ -61,5 +74,5 @@ index 3188c88db..9fbdb3c05 100644
if (ptx_vector.empty())
{
--
-2.49.0
+2.50.1 (Apple Git-155)