Skip to contentSkip to conversation

zeromq: remove libuuid dependency

PATCH Superseded spdawson at gmail.com 2 participants 3 messages Apr 11, 2013 – Apr 13, 2013

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 zeromq: remove libuuid dependency

From: Simon Dawson <[email protected]>

Since version 3.1.0, zeromq no longer depends on libuuid.

---
v2: Updated for recent addition of zeromq thread dependency

 package/cppzmq/Config.in |   10 ++++------
 package/czmq/Config.in   |   10 ++++------
 package/filemq/Config.in |   15 ++++++---------
 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(+), 36 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 +4 -6
index 7e4205e..f23f492 100644
@@ -1,16 +1,14 @@
 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_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 \
-		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "czmq requires a toolchain with C++, IPV6 and thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+		&& BR2_TOOLCHAIN_HAS_THREADS)
package/filemq/Config.in +6 -9
index d25f03f..48c61c5 100644
@@ -2,17 +2,14 @@ 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_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 \
-		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "filemq requires a toolchain with C++, IPv6 and thread support"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+		&& 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/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 ba585d9..3cd607b 100644
@@ -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
 
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.7.10.4
#1 lore raw

PATCH v2 1/1 zeromq: remove libuuid dependency

Hi, Simon!

2013/4/11 <[email protected]>

Quoted 29 lines

From: Simon Dawson <[email protected]>

Since version 3.1.0, zeromq no longer depends on libuuid.

package/czmq/Config.in +1 -4
index 7e4205e..f23f492 100644
@@ -1,16 +1,14 @@
 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_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 \

package/czmq/Config.in line 14

Quoted 4 lines
package/czmq/Config.in +3 -1
-               && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "czmq requires a toolchain with C++, IPV6 and thread support"
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
+               && BR2_TOOLCHAIN_HAS_THREADS)

Tested using a Buildroot-generated toolchain of gcc 4.8 with uClibc
0.9.33 without WCHAR
(i.e., cc reports wchar_t as an unknown type). The build fails because a configure test for C99
(as well as GNU99) uses wchar_t in a compile-test program: obviously, it is not able to find
a compiler switch to turn on C99 support, and generates Makefile(s) that call CC in default
mode. It just happened that the Buildroot-generated gcc is using ISO C90 as default mode
(and that is well justified because wchar_t is in C99 standard).

In CZMQ source C++-style comments are used. That makes a C90 compiler mad.

Do I need to supply my Buildroot config, czmq config.log and compile
output?

cppzmq, zmqpp and zeromq appear to have been built OK with this patch.

--
Best regards,
Alexander Lukichev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130412/e9f89191/attachment-0001.html>

#2 lore raw

PATCH v2 1/1 zeromq: remove libuuid dependency

Hi Alexander; thanks for testing this.

Quoted 5 lines · Alexander Lukichev

Tested using a Buildroot-generated toolchain of gcc 4.8 with uClibc 0.9.33
without WCHAR
(i.e., cc reports wchar_t as an unknown type). The build fails because a configure test for C99
(as well as GNU99) uses wchar_t in a compile-test program

Okay; I'll reinstate the WCHAR dependency for czmq then.

Quoted 2 lines

Do I need to supply my Buildroot config, czmq config.log and compile
output?

No, thanks.

Quoted 1 line

cppzmq, zmqpp and zeromq appear to have been built OK with this patch.

Okay, thanks.

Simon.