Skip to content

Commit 1b6dec9

Browse files
committed
depends: drop miniupnpc
1 parent 953533d commit 1b6dec9

File tree

8 files changed

+1
-130
lines changed

8 files changed

+1
-130
lines changed

depends/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ NO_BDB ?=
4040
NO_SQLITE ?=
4141
NO_WALLET ?=
4242
NO_ZMQ ?=
43-
NO_UPNP ?=
4443
NO_USDT ?=
4544
MULTIPROCESS ?=
4645
LTO ?=
@@ -157,13 +156,11 @@ bdb_packages_$(NO_BDB) = $(bdb_packages)
157156
sqlite_packages_$(NO_SQLITE) = $(sqlite_packages)
158157
wallet_packages_$(NO_WALLET) = $(bdb_packages_) $(sqlite_packages_)
159158

160-
upnp_packages_$(NO_UPNP) = $(upnp_packages)
161-
162159
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
163160
multiprocess_packages_$(MULTIPROCESS) = $(multiprocess_packages)
164161
usdt_packages_$(NO_USDT) = $(usdt_$(host_os)_packages)
165162

166-
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(upnp_packages_) $(usdt_packages_)
163+
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(boost_packages_) $(libevent_packages_) $(qt_packages_) $(wallet_packages_) $(usdt_packages_)
167164
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
168165

169166
ifneq ($(zmq_packages_),)
@@ -231,7 +228,6 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
231228
-e 's|@wallet_packages@|$(wallet_packages_)|' \
232229
-e 's|@bdb_packages@|$(bdb_packages_)|' \
233230
-e 's|@sqlite_packages@|$(sqlite_packages_)|' \
234-
-e 's|@upnp_packages@|$(upnp_packages_)|' \
235231
-e 's|@usdt_packages@|$(usdt_packages_)|' \
236232
-e 's|@no_harden@|$(NO_HARDEN)|' \
237233
-e 's|@multiprocess@|$(MULTIPROCESS)|' \

depends/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ The following can be set when running make: `make FOO=bar`
112112
- `NO_WALLET`: Don't download/build/cache libs needed to enable the wallet
113113
- `NO_BDB`: Don't download/build/cache BerkeleyDB
114114
- `NO_SQLITE`: Don't download/build/cache SQLite
115-
- `NO_UPNP`: Don't download/build/cache packages needed for enabling UPnP
116115
- `NO_USDT`: Don't download/build/cache packages needed for enabling USDT tracepoints
117116
- `MULTIPROCESS`: Build libmultiprocess (experimental)
118117
- `DEBUG`: Disable some optimizations and enable more runtime checking

depends/packages/miniupnpc.mk

Lines changed: 0 additions & 36 deletions
This file was deleted.

depends/packages/packages.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ sqlite_packages=sqlite
1717

1818
zmq_packages=zeromq
1919

20-
upnp_packages=miniupnpc
21-
2220
multiprocess_packages = libmultiprocess capnp
2321
multiprocess_native_packages = native_libmultiprocess native_capnp
2422

depends/patches/miniupnpc/cmake_get_src_addr.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

depends/patches/miniupnpc/dont_leak_info.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.

depends/patches/miniupnpc/fix_windows_snprintf.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

depends/toolchain.cmake.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,6 @@ else()
139139
set(WITH_SQLITE ON CACHE BOOL "")
140140
endif()
141141

142-
set(upnp_packages @upnp_packages@)
143-
if("${upnp_packages}" STREQUAL "")
144-
set(WITH_MINIUPNPC OFF CACHE BOOL "")
145-
else()
146-
set(WITH_MINIUPNPC ON CACHE BOOL "")
147-
endif()
148-
149142
set(usdt_packages @usdt_packages@)
150143
if("${usdt_packages}" STREQUAL "")
151144
set(WITH_USDT OFF CACHE BOOL "")

0 commit comments

Comments
 (0)