diff options
| author | Jonathan Ben Avraham <yba@tkos.co.il> | 2015-08-03 18:51:12 +0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-08-04 11:19:25 +0200 |
| commit | 43d51e5b5084c8db70778b501dc81696c4028228 (patch) | |
| tree | 218e36afc33b7b8637a621a2d154b4c1962d63bb /package/zeromq/0004-allow-without-libsodium.patch | |
| parent | c123b581268c6b55c03d7bc283adc027908a293c (diff) | |
| download | buildroot-43d51e5b5084c8db70778b501dc81696c4028228.tar.gz buildroot-43d51e5b5084c8db70778b501dc81696c4028228.zip | |
zeromq: bump to version 4.1.2
In the upstream git://github.com/zeromq/libzmq.git:
commit 6fdafc458a776e063511bb83dc7791aabea00b05 obviated the need for
0001-tests-disable-test_fork-if-fork-is-not-available.patch .
commit c8ee16940fff19ae3c12b4596c4bd131b2c71996 obviated the need for
0004-allow-without-libsodium.patch .
Fixed AUTORECONF comment in zeromq.mk to refer to the correct patch,
0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch
Signed-off-by: Jonathan Ben Avraham <yba@tkos.co.il>
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, 0 insertions, 38 deletions
diff --git a/package/zeromq/0004-allow-without-libsodium.patch b/package/zeromq/0004-allow-without-libsodium.patch deleted file mode 100644 index 19850ba730..0000000000 --- a/package/zeromq/0004-allow-without-libsodium.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 - |
