diff options
| author | Frank Hunleth <fhunleth@troodon-software.com> | 2015-05-19 08:01:11 -0400 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-07-11 00:04:30 +0200 |
| commit | 6272583956ebd659f40cd5e7ef89367abaa83539 (patch) | |
| tree | b31dd5a53f5ed0e5b8f4bf073336537039d6ee31 /package/zeromq/0004-allow-without-libsodium.patch | |
| parent | 03b5b63c248e9532c80b4363c6825a3f36c73167 (diff) | |
| download | buildroot-6272583956ebd659f40cd5e7ef89367abaa83539.tar.gz buildroot-6272583956ebd659f40cd5e7ef89367abaa83539.zip | |
zeromq: depend on libsodium if available
ZeroMQ doesn't require libsodium, but will enable CURVE security if it's
available. This patch adds the optional dependency.
[Thomas: pass --without-libsodium explicitly when libsodium is not
enabled, and to achieve this, backport a patch from upstream zeromq.]
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/zeromq/0004-allow-without-libsodium.patch')
| -rw-r--r-- | package/zeromq/0004-allow-without-libsodium.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/package/zeromq/0004-allow-without-libsodium.patch b/package/zeromq/0004-allow-without-libsodium.patch new file mode 100644 index 0000000000..19850ba730 --- /dev/null +++ b/package/zeromq/0004-allow-without-libsodium.patch @@ -0,0 +1,38 @@ +From c561766ab4ee4b3420b72e33fac4a75fb9194430 Mon Sep 17 00:00:00 2001 +From: Min RK <benjaminrk@gmail.com> +Date: Mon, 16 Feb 2015 14:59:54 -0800 +Subject: [PATCH] allow `--without-libsodium` + +and `--with-libsodium=no` to disable linking against libsodium. + +Without this patch, it is not possible to disable linking with libsodium present on the default path. + +Backport from upstream commit +faaf4550263395b84e6a80d3f9d7ba8816cdd714. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 194fcb2..3d5f6d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -257,7 +257,12 @@ esac + # Checks for libraries + AC_CHECK_LIB([pthread], [pthread_create]) + AC_CHECK_LIB([rt], [clock_gettime]) +-AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security)) ++ ++if test "x$with_libsodium" != "xno"; then ++ AC_CHECK_LIB([sodium], [sodium_init],,AC_MSG_WARN(libsodium is needed for CURVE security)) ++else ++ AC_MSG_WARN(libsodium is needed for CURVE security) ++fi + + # + # Check if the compiler supports -fvisibility=hidden flag. MinGW32 uses __declspec +-- +2.4.5 + |
