Skip to content

Commit 4241c19

Browse files
committed
Merge bitcoin/bitcoin#24134: build: Fix zeromq package when cross-compiling
f13e642 build: Disable valgrind when building zeromq package in depends (Hennadii Stepanov) b970f03 build: Disable libbsd when building zeromq package in depends (Hennadii Stepanov) 7789999 build: Update netbsd_kevent_void.patch (Hennadii Stepanov) Pull request description: Since v4.3.3 (zeromq/libzmq@068385c) `libzmq` uses `libbsd` by default. This PR disables `libbsd` explicitly, as it's not a part of our depends. Zeromq will fallback to its internal `strlcpy` implementation. Otherwise, on systems with installed `libbsd-dev` package the `zeromq` package build system erroneously detects `libbsd` package from the host system: ```diff --- a/libzmq.pc +++ b/libzmq.pc @@ -8,5 +8,5 @@ Version: 4.3.4 Libs: -L${libdir} -lzmq Libs.private: -lpthread -Requires.private: +Requires.private: libbsd Cflags: -I${includedir} ``` This causes the `configure` fails to detect the `zeromq` package: ``` configure: WARNING: libzmq version 4.x or greater not found, disabling ``` --- Other minor improvements: - fixed `netbsd_kevent_void.patch` offset - disabled valgrind as it's used in unit tests which we do not run: ```diff --- a/zmq-configure-output +++ b/zmq-configure-output @@ -119,11 +119,6 @@ checking whether the g++ -m64 linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes checking dynamic linker characteristics... (cached) GNU/Linux ld.so checking how to hardcode library paths into programs... immediate -checking for valgrind... valgrind -checking for Valgrind tool memcheck... memcheck -checking for Valgrind tool helgrind... helgrind -checking for Valgrind tool drd... drd -checking for Valgrind tool exp-sgcheck... exp-sgcheck checking linker version script flag... --version-script checking if version scripts can use complex wildcards... yes checking for working posix_memalign... yes ``` ACKs for top commit: fanquake: ACK f13e642 Tree-SHA512: d4c86d4a841eb6e7c32157e84972243072f905496c2a4c14ec6f6ab4216df6695cbf29baa2233ce27eaede35d1e250ad2f9975b16f570d01509f0c5da4597cad
2 parents 3d22371 + f13e642 commit 4241c19

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

depends/packages/zeromq.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ $(package)_sha256_hash=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336
66
$(package)_patches=remove_libstd_link.patch netbsd_kevent_void.patch
77

88
define $(package)_set_vars
9-
$(package)_config_opts=--without-docs --disable-shared --disable-curve --disable-curve-keygen --disable-perf
9+
$(package)_config_opts = --without-docs --disable-shared --disable-valgrind
10+
$(package)_config_opts += --disable-perf --disable-curve-keygen --disable-curve --disable-libbsd
1011
$(package)_config_opts += --without-libsodium --without-libgssapi_krb5 --without-pgm --without-norm --without-vmci
1112
$(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov --disable-dependency-tracking
1213
$(package)_config_opts += --disable-Werror --disable-drafts --enable-option-checking

depends/patches/zeromq/netbsd_kevent_void.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ diff --git a/configure.ac b/configure.ac
1010
index 1a571291..402f8b86 100644
1111
--- a/configure.ac
1212
+++ b/configure.ac
13-
@@ -308,6 +308,27 @@ case "${host_os}" in
13+
@@ -307,6 +307,27 @@ case "${host_os}" in
1414
if test "x$libzmq_netbsd_has_atomic" = "xno"; then
1515
AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
1616
fi

0 commit comments

Comments
 (0)