monero: update to 0.17.2.0

This commit is contained in:
FollieHiyuki 2021-04-12 23:23:09 +03:00 committed by Érico Nogueira Rolim
parent ef8271436c
commit 60d34acee3
3 changed files with 15 additions and 14 deletions

View File

@ -1,11 +1,13 @@
--- CMakeLists.txt 2017-09-22 19:22:04.735657685 +0200
+++ CMakeLists.txt 2017-09-22 19:20:08.164169125 +0200
@@ -388,7 +388,7 @@
include(TestCXXAcceptsFlag)
set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all")
diff --git CMakeLists.txt CMakeLists.txt
index 953707657..394e8cb32 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -581,7 +581,7 @@ else()
set_default_arch()
endif()
message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
+ if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
- if(ARCH STREQUAL "default")
+ if(ARCH STREQUAL "default" OR CMAKE_CROSSCOMPILING)
set(ARCH_FLAG "")
elseif(PPC64LE)
set(ARCH_FLAG "-mcpu=${ARCH}")
set(ARCH_FLAG "-mcpu=power8")

View File

@ -1,7 +1,6 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -430,6 +430,14 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
@@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
@ -19,9 +18,9 @@ diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 9b21705e..76340a22 100644
--- src/p2p/net_node.inl
+++ src/p2p/net_node.inl
@@ -49,9 +49,16 @@
#include "storages/levin_abstract_invoke2.h"
@@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h"
#include "cryptonote_core/cryptonote_core.h"
#include "net/parse.h"
-#include <miniupnp/miniupnpc/miniupnpc.h>
-#include <miniupnp/miniupnpc/upnpcommands.h>

View File

@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.1.9
revision=2
version=0.17.2.0
revision=1
_randomx_version="1.1.8"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@ -23,7 +23,7 @@ distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz
https://github.com/tevador/RandomX/archive/v${_randomx_version}.tar.gz
https://github.com/Tencent/rapidjson/archive/${_rapidjson_gitrev}.tar.gz
https://github.com/monero-project/supercop/archive/${_supercop_gitrev}.tar.gz"
checksum="efedac6d9a64488f57e5237cb6199b56d819c8315f529af5142a9e41fcfcac91
checksum="5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496
f982a12d18b1d260bef2a1d3c46ae4902975fbf63abb38ca6413c96d1778db3a
44b007d419ac21b6affec58991e865ee572346ead19b73cf1c3e4e11c7a81273
b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7"