Skip to contentSkip to conversation

zeromq: remove libuuid dependency

PATCH New spdawson at gmail.com 1 participant 1 message May 6, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 zeromq: remove libuuid dependency

From: Simon Dawson <[email protected]>

Since version 3.1.0, zeromq no longer depends on libuuid.

---
v4: Update patch, and rework mongrel2 package dependencies
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     |  7 +++----
 package/filemq/Config.in   | 14 ++++++--------
 package/filemq/filemq.mk   |  2 +-
 package/mongrel2/Config.in |  7 +++++--
 package/zeromq/Config.in   | 10 +++-------
 package/zeromq/zeromq.mk   |  1 -
 package/zmqpp/Config.in    | 10 ++++------
 8 files changed, 26 insertions(+), 35 deletions(-)
package/cppzmq/Config.in +4 -6
index 72f0238..121a346 100644
@@ -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)
package/czmq/Config.in +3 -4
index 7e4205e..c3f952c 100644
@@ -3,14 +3,13 @@ config 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_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS # 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)
package/filemq/Config.in +6 -8
index d25f03f..372d5bd 100644
@@ -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)
package/filemq/filemq.mk +1 -1
index 0ea7a9d..6c760d4 100644
@@ -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
 
package/mongrel2/Config.in +5 -2
index 05d10d7..c558f81 100644
@@ -4,8 +4,7 @@ config BR2_PACKAGE_MONGREL2
 	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_INET_IPV6 # zeromq
-	depends on BR2_LARGEFILE # zeromq -> util-linux
-	depends on BR2_USE_WCHAR # zeromq -> util-linux
+	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using
@@ -16,3 +15,7 @@ config BR2_PACKAGE_MONGREL2
 	  and hack on it.
 
 	  http://www.mongrel2.org
+
+comment "mongrel2 requires a toolchain with C++, IPV6 and thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+		&& BR2_TOOLCHAIN_HAS_THREADS)
package/zeromq/Config.in +3 -7
index 35704c3..2046c66 100644
@@ -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
package/zeromq/zeromq.mk +0 -1
index bebba20..02578ea 100644
@@ -7,7 +7,6 @@
 ZEROMQ_VERSION = 3.2.3
 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
 
package/zmqpp/Config.in +4 -6
index 9afcca4..f3e4478 100644
@@ -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"
Signature · 1 line
1.8.1.2