diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
commit | 32750e8c3ed38df4cafb39cffa878c6851abc899 (patch) | |
tree | dcf40b321c3b492bd1d00244c78f72160e66a554 /gnu/packages/patches/monero-use-system-miniupnpc.patch | |
parent | 6104071e483095f9fea9700e0317e84f64102ae2 (diff) | |
parent | e1e32303129c5aedc7236d5cc854d6b72ad35daf (diff) | |
download | guix-patches-32750e8c3ed38df4cafb39cffa878c6851abc899.tar guix-patches-32750e8c3ed38df4cafb39cffa878c6851abc899.tar.gz |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/monero-use-system-miniupnpc.patch')
-rw-r--r-- | gnu/packages/patches/monero-use-system-miniupnpc.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/patches/monero-use-system-miniupnpc.patch b/gnu/packages/patches/monero-use-system-miniupnpc.patch index c5d376d793..2bd179946f 100644 --- a/gnu/packages/patches/monero-use-system-miniupnpc.patch +++ b/gnu/packages/patches/monero-use-system-miniupnpc.patch @@ -1,14 +1,16 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 7553f87e..8e865c6c 100644 +index 5b7f69a56..3a353a0f3 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -37,19 +37,7 @@ +@@ -37,21 +37,7 @@ 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) @@ -24,12 +26,12 @@ index 7553f87e..8e865c6c 100644 find_package(Unbound) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index 74924e4f..3554dd0d 100644 +index d4b39869c..13071d898 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl -@@ -49,9 +49,9 @@ - #include "storages/levin_abstract_invoke2.h" +@@ -61,9 +61,9 @@ #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" -#include <miniupnp/miniupnpc/miniupnpc.h> -#include <miniupnp/miniupnpc/upnpcommands.h> |