diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-04-09 20:41:33 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-04-09 22:09:11 +0100 |
| commit | a9d6e2dddd7b532b75d97a25c9f3804fc64176b7 (patch) | |
| tree | 9293d120e0c20581ead7fb1ab1c19b8881c024d5 /net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch | |
| parent | net-p2p/monero: move USE_DEVICE_TREZOR to common options (diff) | |
| download | portage-a9d6e2dddd7b532b75d97a25c9f3804fc64176b7.tar.xz | |
net-p2p/monero: add 9999
Diffstat (limited to 'net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch')
| -rw-r--r-- | net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch b/net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch new file mode 100644 index 00000000..23c13dcf --- /dev/null +++ b/net-p2p/monero/files/monero-9999-Drop-in-tree-miniupnpc.patch @@ -0,0 +1,60 @@ +From 016ecdb58767bc1f44dcc3a00d79b44a739672eb Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin <bertrand@jacquin.bzh> +Date: Sun, 17 Jun 2018 22:34:11 +0100 +Subject: [PATCH] Drop in-tree miniupnpc + +Since 6b8539803184 ("Build: update CMake and p2p for in-tree +miniupnp"), a hard dependency is made on miniupnpc which is a git +submodule not part of the archive available upstream. +--- + external/CMakeLists.txt | 19 +++---------------- + src/p2p/net_node.inl | 6 +++--- + 2 files changed, 6 insertions(+), 19 deletions(-) + +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index 8deadc7ba63d..85db7880bd05 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -36,22 +36,9 @@ + # others. + + find_package(Miniupnpc REQUIRED) +- +-message(STATUS "Using in-tree miniupnpc") +-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) +-add_subdirectory(miniupnp/miniupnpc) +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() +- +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++set(UPNP_STATIC false PARENT_SCOPE) ++set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + + find_package(Unbound) + +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 815c1b354ef2..40205f50ca8b 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -58,9 +58,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include <miniupnp/miniupnpc/miniupnpc.h> +-#include <miniupnp/miniupnpc/upnpcommands.h> +-#include <miniupnp/miniupnpc/upnperrors.h> ++#include <miniupnpc/miniupnpc.h> ++#include <miniupnpc/upnpcommands.h> ++#include <miniupnpc/upnperrors.h> + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" |