summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Hadjinlian <maxime.hadjinlian@gmail.com>2014-10-26 19:45:10 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-10-27 01:11:06 +0100
commit7f3387d04d3645252ae744d62f55a5a7f83346ea (patch)
treed36b4adff9563937bdaaada69407ae4b7539648e
parent276f9d9c175bb5be5a6acb48f65d09c88d254e29 (diff)
downloadbuildroot-7f3387d04d3645252ae744d62f55a5a7f83346ea.tar.gz
buildroot-7f3387d04d3645252ae744d62f55a5a7f83346ea.zip
czmq: bump version
Remove patch as it was merged upstream. Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/czmq/czmq-0001-Use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch53
-rw-r--r--package/czmq/czmq.mk2
2 files changed, 1 insertions, 54 deletions
diff --git a/package/czmq/czmq-0001-Use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch b/package/czmq/czmq-0001-Use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch
deleted file mode 100644
index cef187a2b7..0000000000
--- a/package/czmq/czmq-0001-Use-_DEFAULT_SOURCE-instead-of-_BSD_SOURCE.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 04be584035b4d9b6a61fd748b6d21c92c6bb9694 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 9 Sep 2014 23:36:10 +0200
-Subject: [PATCH] Use _DEFAULT_SOURCE instead of _BSD_SOURCE
-
-Since glibc 2.20, using _BSD_SOURCE triggers a warning, and since czmq
-uses -Werror, it aborts the build:
-
- CC zchunk.lo
-In file included from /home/thomas/projets/buildroot/output/host/usr/nios2-buildroot-linux-gnu/sysroot/usr/include/ctype.h:25:0,
- from ../include/czmq_prelude.h:203,
- from ../include/czmq.h:19,
- from zauth.c:25:
-/home/thomas/projets/buildroot/output/host/usr/nios2-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
- # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
- ^
-
-See the glibc 2.20 release notes, https://lwn.net/Articles/611162/,
-explaining the change about _BSD_SOURCE:
-
-* The _BSD_SOURCE and _SVID_SOURCE feature test macros are no longer
- supported; they now act the same as _DEFAULT_SOURCE (but generate a
- warning). Except for cases where _BSD_SOURCE enabled BSD interfaces that
- conflicted with POSIX (support for which was removed in 2.19), the
- interfaces those macros enabled remain available when compiling with
- _GNU_SOURCE defined, with _DEFAULT_SOURCE defined, or without any feature
- test macros defined.
-
-Submitted upstream: https://github.com/zeromq/czmq/pull/648
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- include/czmq_prelude.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/czmq_prelude.h b/include/czmq_prelude.h
-index 8b4b53d..f77add2 100644
---- a/include/czmq_prelude.h
-+++ b/include/czmq_prelude.h
-@@ -152,8 +152,8 @@
- # ifndef __NO_CTYPE
- # define __NO_CTYPE // Suppress warnings on tolower()
- # endif
--# ifndef _BSD_SOURCE
--# define _BSD_SOURCE // Include stuff from 4.3 BSD Unix
-+# ifndef _DEFAULT_SOURCE
-+# define _DEFAULT_SOURCE // Include stuff from 4.3 BSD Unix
- # endif
- #elif (defined (Mips))
- # define __UTYPE_MIPS
---
-2.0.0
-
diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index 9bc4a2a292..d25bf01c63 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -4,7 +4,7 @@
#
################################################################################
-CZMQ_VERSION = v2.2.0
+CZMQ_VERSION = v3.0.0
CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION))
# Autoreconf required as we use the git tree
OpenPOWER on IntegriCloud