From ddd79a69099929e7f476b5cf8fb39eb74d54fa51 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 5 Jan 2024 13:05:41 +0100 Subject: [PATCH] pyzmq needs to link libsodium directly --- meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5d61c2eed..0abf33885 100644 --- a/meson.build +++ b/meson.build @@ -47,14 +47,18 @@ if [false, 'default', 'auto'].contains(zmq_prefix) if cfg.get('no_libzmq_extension', false) error('bundled libzmq is disabled, but libzmq was not found') endif - # subproject('libsodium') - # subproject('zeromq') - libzmq = dependency('zmq_static', required: true, static: true) + libzmq = [ + dependency('zmq_static', required: true, static: true), + dependency('sodium_static', required: true, static: true), + ] endif endif elif zmq_prefix == 'bundled' # bundle requested, no search - libzmq = dependency('zmq_static', required: true, static: true) + libzmq = [ + dependency('zmq_static', required: true, static: true), + dependency('sodium_static', required: true, static: true), + ] else # lookup by explicit prefix libzmq = cc.find_library('zmq', dirs: [zmq_prefix / 'lib'], header_include_directories: include_directories(zmq_prefix / 'include'), has_headers: 'zmq.h', required: true)