diff options
| author | fanquake <fanquake@gmail.com> | 2020-08-25 09:40:40 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-08-25 10:26:16 +0800 |
| commit | c6b730dbfcbd454132a660211002f19c6960f014 (patch) | |
| tree | 002786847f9d50d14f9aa59cd0e473146ce2b117 /depends/packages | |
| parent | 7f609f68d835bece8b01da1b09b127c67769ae7d (diff) | |
| parent | f642b49af73fedc6dc9af4ac299e4cfa80755583 (diff) | |
| download | bitcoin-c6b730dbfcbd454132a660211002f19c6960f014.tar.xz | |
Merge #18405: build: Drop all of the ZeroMQ patches
f642b49af73fedc6dc9af4ac299e4cfa80755583 build: Drop ZeroMQ patch for glibc < 2.12 (Hennadii Stepanov)
079df9609e6ed2a09949ebe5e98a179f61709801 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: https://github.com/bitcoin/bitcoin/pull/11986#issuecomment-366105050
ACKs for top commit:
fanquake:
ACK f642b49af73fedc6dc9af4ac299e4cfa80755583.
Tree-SHA512: a2c97cdb682cd7d96a666ad099f20725a32bf8fda0842fc5534ca08a1634c90ba80afde92f9054595ed2501fbc5c02abbe3da765934ecff12d836ff25e277fc5
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/zeromq.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk index 6f35ede248..ce1b25bcf1 100644 --- a/depends/packages/zeromq.mk +++ b/depends/packages/zeromq.mk @@ -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 @@ -16,8 +15,6 @@ define $(package)_set_vars 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 && \ cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub config endef |