[Buildroot] =?buildroot at busybox.net?q?=5BPATCH=20v3=5D=20zeromq=3A=20remove=20libuuid=20dependency?=
spdawson at gmail.com
spdawson at gmail.com
Sat Apr 13 18:27:58 UTC 2013
From: Simon Dawson <spdawson at gmail.com>
Since version 3.1.0, zeromq no longer depends on libuuid.
Signed-off-by: Simon Dawson <spdawson at gmail.com>
---
v3: Reinstate WCHAR dependency for czmq and filemq, as reported by
Alexander Lukichev
v2: Updated for recent addition of zeromq thread dependency
package/cppzmq/Config.in | 10 ++++------
package/czmq/Config.in | 9 ++++-----
package/filemq/Config.in | 14 ++++++--------
package/filemq/filemq.mk | 2 +-
package/zeromq/Config.in | 10 +++-------
package/zeromq/zeromq.mk | 1 -
package/zmqpp/Config.in | 10 ++++------
7 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
index 72f0238..121a346 100644
--- a/package/cppzmq/Config.in
+++ b/package/cppzmq/Config.in
@@ -1,9 +1,7 @@
config BR2_PACKAGE_CPPZMQ
bool "cppzmq"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_INET_IPV6 # zeromq
- depends on BR2_LARGEFILE # util-linux
- depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
select BR2_PACKAGE_ZEROMQ
help
@@ -11,6 +9,6 @@ config BR2_PACKAGE_CPPZMQ
http://github.com/zeromq/cppzmq
-comment "cppzmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
- && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "cppzmq requires a toolchain with C++, IPV6 and thread support"
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+ && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 7e4205e..5f79aae 100644
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -1,16 +1,15 @@
config BR2_PACKAGE_CZMQ
bool "czmq"
- select BR2_PACKAGE_ZEROMQ
depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_INET_IPV6 # zeromq
- depends on BR2_LARGEFILE # util-linux
- depends on BR2_USE_WCHAR # util-linux
+ depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+ select BR2_PACKAGE_ZEROMQ
help
High-level C Binding for 0MQ
http://czmq.zeromq.org/
-comment "czmq requires a toolchain with C++, IPV6, LARGEFILE and WCHAR support"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+comment "czmq requires a toolchain with C++, IPV6, WCHAR and thread support"
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index d25f03f..372d5bd 100644
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -2,17 +2,15 @@ config BR2_PACKAGE_FILEMQ
bool "filemq"
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_CZMQ
- select BR2_PACKAGE_ZEROMQ
- depends on BR2_INSTALL_LIBSTDCPP # zeromq
- depends on BR2_INET_IPV6 # zeromq
- depends on BR2_LARGEFILE # util-linux
- depends on BR2_USE_WCHAR # util-linux
- depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+ depends on BR2_INSTALL_LIBSTDCPP # czmq
+ depends on BR2_INET_IPV6 # czmq
+ depends on BR2_USE_WCHAR # czmq
+ depends on BR2_TOOLCHAIN_HAS_THREADS # czmq
help
FileMQ is a publish-subscribe file service based on 0MQ.
http://github.com/zeromq/filemq
-comment "filemq requires a toolchain with C++, IPv6, LARGEFILE, WCHAR & thread support"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
+comment "filemq requires a toolchain with C++, IPv6, WCHAR and thread support"
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
index 0ea7a9d..6c760d4 100644
--- a/package/filemq/filemq.mk
+++ b/package/filemq/filemq.mk
@@ -9,7 +9,7 @@ FILEMQ_SITE = git://github.com/zeromq/filemq.git
FILEMQ_AUTORECONF = YES
FILEMQ_INSTALL_STAGING = YES
-FILEMQ_DEPENDENCIES = czmq openssl zeromq
+FILEMQ_DEPENDENCIES = czmq openssl
FILEMQ_LICENSE = LGPLv3+ with exceptions
FILEMQ_LICENSE_FILES = COPYING COPYING.LESSER
diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index 35704c3..2046c66 100644
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -1,16 +1,12 @@
-comment "zeromq requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
- && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "zeromq requires a toolchain with C++, IPV6 and thread support"
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+ && BR2_TOOLCHAIN_HAS_THREADS)
config BR2_PACKAGE_ZEROMQ
bool "zeromq"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_INET_IPV6
- depends on BR2_LARGEFILE # util-linux
- depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_UTIL_LINUX
- select BR2_PACKAGE_UTIL_LINUX_LIBUUID
help
ÃMQ (ZeroMQ, 0MQ, zmq) looks like an embeddable networking
library but acts like a concurrency framework. It gives you
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index ba585d9..3cd607b 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -7,7 +7,6 @@
ZEROMQ_VERSION = 3.2.2
ZEROMQ_SITE = http://download.zeromq.org/
ZEROMQ_INSTALL_STAGING = YES
-ZEROMQ_DEPENDENCIES = util-linux
ZEROMQ_LICENSE = LGPLv3+ with exceptions
ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index 9afcca4..f3e4478 100644
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -1,10 +1,8 @@
config BR2_PACKAGE_ZMQPP
bool "zmqpp"
depends on !BR2_avr32 # compiler needs c++0x support
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_INSTALL_LIBSTDCPP # zeromq
depends on BR2_INET_IPV6 # zeromq
- depends on BR2_LARGEFILE # util-linux
- depends on BR2_USE_WCHAR # util-linux
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
select BR2_PACKAGE_ZEROMQ
help
@@ -15,9 +13,9 @@ config BR2_PACKAGE_ZMQPP
http://github.com/benjamg/zmqpp
-comment "zmqpp requires a toolchain with C++, IPV6, LARGEFILE, WCHAR & thread support"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_LARGEFILE \
- && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "zmqpp requires a toolchain with C++, IPV6 and thread support"
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+ && BR2_TOOLCHAIN_HAS_THREADS)
config BR2_PACKAGE_ZMQPP_CLIENT
bool "zmqpp client"
--
1.7.10.4
More information about the buildroot
mailing list