Skip to content

Commit c6b730d

Browse files
committed
Merge #18405: build: Drop all of the ZeroMQ patches
f642b49 build: Drop ZeroMQ patch for glibc < 2.12 (Hennadii Stepanov) 079df96 build: Drop ZeroMQ patch for Mingw-w64 < 4.0 (Hennadii Stepanov) Pull request description: This PR gets rid of the all patches for ZeroMQ: - the [Mingw-w64 5.0 (Ubuntu 18.04 bionic)](https://packages.ubuntu.com/bionic/mingw-w64) is used to build the [Windows](https://github.com/bitcoin/bitcoin/blob/master/doc/build-windows.md) binaries - it is safe to use `pthread_setname_np` since #17538 when the minimal `glibc` version is set to 2.17; see: bitcoin/bitcoin#11986 (comment) ACKs for top commit: fanquake: ACK f642b49. Tree-SHA512: a2c97cdb682cd7d96a666ad099f20725a32bf8fda0842fc5534ca08a1634c90ba80afde92f9054595ed2501fbc5c02abbe3da765934ecff12d836ff25e277fc5
2 parents 7f609f6 + f642b49 commit c6b730d

File tree

3 files changed

+0
-68
lines changed

3 files changed

+0
-68
lines changed

depends/packages/zeromq.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ $(package)_version=4.3.1
33
$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
44
$(package)_file_name=$(package)-$($(package)_version).tar.gz
55
$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
6-
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch
76

87
define $(package)_set_vars
98
$(package)_config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf
@@ -16,8 +15,6 @@ define $(package)_set_vars
1615
endef
1716

1817
define $(package)_preprocess_cmds
19-
patch -p1 < $($(package)_patch_dir)/0001-fix-build-with-older-mingw64.patch && \
20-
patch -p1 < $($(package)_patch_dir)/0002-disable-pthread_set_name_np.patch && \
2118
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config
2219
endef
2320

depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch

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

depends/patches/zeromq/0002-disable-pthread_set_name_np.patch

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

0 commit comments

Comments
 (0)