diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-22 14:29:21 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-30 12:41:20 +0800 |
| commit | f5618c79d9e7af05c2987044dc2da03697f8bb89 (patch) | |
| tree | 977b204a23844f636f7bd7c2e38a467f41754c16 /depends | |
| parent | 6866b571ab96f03ca0775424e45458c5731f230f (diff) | |
| download | bitcoin-f5618c79d9e7af05c2987044dc2da03697f8bb89.tar.xz | |
depends: add upstream CMake patch to miniupnpc
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/miniupnpc.mk | 5 | ||||
| -rw-r--r-- | depends/patches/miniupnpc/cmake_get_src_addr.patch | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/depends/packages/miniupnpc.mk b/depends/packages/miniupnpc.mk index 39c640f1e7..93b29fe6ba 100644 --- a/depends/packages/miniupnpc.mk +++ b/depends/packages/miniupnpc.mk @@ -3,7 +3,7 @@ $(package)_version=2.2.7 $(package)_download_path=https://miniupnp.tuxfamily.org/files/ $(package)_file_name=$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=b0c3a27056840fd0ec9328a5a9bac3dc5e0ec6d2e8733349cf577b0aa1e70ac1 -$(package)_patches=dont_leak_info.patch no_libtool.patch fix_windows_build.patch +$(package)_patches=dont_leak_info.patch no_libtool.patch fix_windows_build.patch cmake_get_src_addr.patch define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" @@ -14,7 +14,8 @@ endef define $(package)_preprocess_cmds patch -p1 < $($(package)_patch_dir)/dont_leak_info.patch && \ patch -p1 < $($(package)_patch_dir)/no_libtool.patch && \ - patch -p1 < $($(package)_patch_dir)/fix_windows_build.patch + patch -p1 < $($(package)_patch_dir)/fix_windows_build.patch && \ + patch -p1 < $($(package)_patch_dir)/cmake_get_src_addr.patch endef define $(package)_build_cmds diff --git a/depends/patches/miniupnpc/cmake_get_src_addr.patch b/depends/patches/miniupnpc/cmake_get_src_addr.patch new file mode 100644 index 0000000000..bae1b738f3 --- /dev/null +++ b/depends/patches/miniupnpc/cmake_get_src_addr.patch @@ -0,0 +1,22 @@ +commit cb2026239c2a3aff393952ccb0ee1c448189402d +Author: fanquake <fanquake@gmail.com> +Date: Fri Mar 22 14:03:54 2024 +0000 + + build: add MINIUPNPC_GET_SRC_ADDR to CMake build + + This mirrors the autotools build. + + See https://github.com/miniupnp/miniupnp/pull/721. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1aa95a8..0cacf3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,7 @@ endif () + if (NOT WIN32) + target_compile_definitions(miniupnpc-private INTERFACE + MINIUPNPC_SET_SOCKET_TIMEOUT ++ MINIUPNPC_GET_SRC_ADDR + _BSD_SOURCE _DEFAULT_SOURCE) + if (NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES ".*BSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS") + # add_definitions (-D_POSIX_C_SOURCE=200112L) |