Skip to content

Commit

Permalink
build: Drop all of the ZeroMQ patches
Browse files Browse the repository at this point in the history
Summary:
```
This PR gets rid of the all patches for ZeroMQ:
 - the Mingw-w64 5.0 (Ubuntu 18.04 bionic) is used to build the Windows
binaries
 - it is safe to use pthread_setname_np since #17538 when the minimal
glibc version is set to 2.17; see: #11986 (comment)
```

Note: Debian Buster has MinGw 6.0 and we enforce glibc >= 2.19.

Backport of core [[bitcoin/bitcoin#18405 | PR18405]].

Test Plan:
  make build-all

Reviewers: #bitcoin_abc, majcosta

Reviewed By: #bitcoin_abc, majcosta

Differential Revision: https://reviews.bitcoinabc.org/D7760
  • Loading branch information
hebasto authored and sickpig committed May 13, 2021
1 parent 66c8e65 commit ed7706e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 71 deletions.
6 changes: 0 additions & 6 deletions depends/packages/zeromq.mk
Expand Up @@ -3,7 +3,6 @@ $(package)_version=4.3.1
$(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb
$(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch

define $(package)_set_vars
$(package)_config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf
Expand All @@ -14,11 +13,6 @@ define $(package)_set_vars
$(package)_cxxflags=-std=c++11
endef

define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/0001-fix-build-with-older-mingw64.patch && \
patch -p1 < $($(package)_patch_dir)/0002-disable-pthread_set_name_np.patch
endef

define $(package)_config_cmds
$($(package)_autoconf)
endef
Expand Down
30 changes: 0 additions & 30 deletions depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch

This file was deleted.

35 changes: 0 additions & 35 deletions depends/patches/zeromq/0002-disable-pthread_set_name_np.patch

This file was deleted.

0 comments on commit ed7706e

Please sign in to comment.