summaryrefslogtreecommitdiff
path: root/net-p2p/monero/files/0.12.2.0-Drop-in-tree-miniupnpc.patch
blob: c7b9d543231d9d80d22541ec261cf9dbe71d10ab (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
From 694352e707574580d4249ead6673ffa2e7fcd0c2 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 | 16 +++-------------
 src/p2p/net_node.inl    |  6 +++---
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 1fc4d64c1cbf..48a6a9a32f08 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -36,19 +36,9 @@
 # others.
 
 find_package(Miniupnpc REQUIRED)
-
-message(STATUS "Using in-tree miniupnpc")
-
-add_subdirectory(miniupnp/miniupnpc)
-
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-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()
-
-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 07f369d40544..e10e4cfbc606 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -49,9 +49,9 @@
 #include "storages/levin_abstract_invoke2.h"
 #include "cryptonote_core/cryptonote_core.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"