From d2d8a990c46a8f62fd4c27b5867e64e0563347db Mon Sep 17 00:00:00 2001 From: Lucas Russo Date: Wed, 1 Jul 2020 17:04:23 -0300 Subject: [PATCH 1/2] README.md: add additional PKG_CONFIG paths for libzmq This is needed for libzmq 4.2.5, so we use libsodium and avoid issues zeromq/libzmq#2991 and zeromq/czmq#1299 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c47aa0a..019b1fcc 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ for project in libsodium libzmq czmq; do CONFIG_OPTS+=("CFLAGS=-Wno-format-truncation") CONFIG_OPTS+=("CPPFLAGS=-Wno-format-truncation") if [ $project == "libzmq" ]; then - CONFIG_OPTS+=("--with-libsodium") + CONFIG_OPTS+=("PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --with-libsodium") fi cd $project && \ From 24f8574ef42c67224c7dc9f0586d2ca071b8ae8b Mon Sep 17 00:00:00 2001 From: Lucas Russo Date: Wed, 1 Jul 2020 17:05:44 -0300 Subject: [PATCH 2/2] doc: add additional PKG_CONFIG paths for libzmq This is needed for libzmq 4.2.5, so we use libsodium and avoid issues zeromq/libzmq#2991 and zeromq/czmq#1299 --- doc/halcs-installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/halcs-installation.rst b/doc/halcs-installation.rst index 9c39eb28..a2cdad1f 100644 --- a/doc/halcs-installation.rst +++ b/doc/halcs-installation.rst @@ -102,7 +102,7 @@ following snippet: CONFIG_OPTS+=("CFLAGS=-Wno-format-truncation") CONFIG_OPTS+=("CPPFLAGS=-Wno-format-truncation") if [ $project == "libzmq" ]; then - CONFIG_OPTS+=("--with-libsodium") + CONFIG_OPTS+=("PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --with-libsodium") fi cd $project && \