phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

depends: add zeromq builtin sha1 patch

Browse source
This commit is contained in:
fanquake 2024-07-15 16:34:44 +01:00
parent 0c8605253a
commit 2de68d6d38
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
depends/packages/zeromq.mk
View file

@ -5,6 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43 $(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
$(package)_patches = remove_libstd_link.patch $(package)_patches = remove_libstd_link.patch
$(package)_patches += macos_mktemp_check.patch $(package)_patches += macos_mktemp_check.patch
$(package)_patches += builtin_sha1.patch
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind $(package)_config_opts = --without-docs --disable-shared --disable-valgrind
@ -16,7 +17,8 @@ endef
define $(package)_preprocess_cmds define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \ patch -p1 < $($(package)_patch_dir)/remove_libstd_link.patch && \
patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch patch -p1 < $($(package)_patch_dir)/macos_mktemp_check.patch && \
patch -p1 < $($(package)_patch_dir)/builtin_sha1.patch
endef endef
define $(package)_config_cmds define $(package)_config_cmds

17
depends/patches/zeromq/builtin_sha1.patch Normal file
View file

@ -0,0 +1,17 @@
Don't use builtin sha1 if not using ws
The builtin SHA1 (ZMQ_USE_BUILTIN_SHA1) is only used in the websocket
engine (ws_engine.cpp).
Upstreamed in https://github.com/zeromq/libzmq/pull/4670.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,7 @@ if(NOT ZMQ_USE_GNUTLS)
endif()
endif()
endif()
- if(NOT ZMQ_USE_NSS)
+ if(ENABLE_WS AND NOT ZMQ_USE_NSS)
list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.c
${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.h)
message(STATUS "Using builtin sha1")