Your message dated Sun, 25 Sep 2011 21:32:38 +0000
with message-id <[email protected]>
and subject line Bug#637777: fixed in pyzmq 2.1.9-1
has caused the Debian Bug report #637777,
regarding zeromq: fix kFreeBSD build
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
637777: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637777
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: src:zeromq
Version: 2.1.7-1
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd-porting

Hi!

Your package failed to build on kfreebsd as the uuid code is
conditionalized on FreeBSD vs Linux while the code is actually GLIBC /
BSDLibC specific. Attached patch fixes this problem and allows zeromq to
build on kfreebsd

Regards

    Christoph

If you have further questions please mail [email protected]

Patch:

--- zeromq-2.1.7.orig/configure
+++ zeromq-2.1.7/configure
@@ -16427,6 +17058,57 @@ $as_echo "#define ZMQ_FORCE_MUTEXES 1" >
         fi
         ;;
     *freebsd*)
+        case "${host_os}" in
+            *kfreebsd*)
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 
uuid_generate in -luuid" >&5
+$as_echo_n "checking for uuid_generate in -luuid... " >&6; }
+if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-luuid  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char uuid_generate ();
+int
+main ()
+{
+return uuid_generate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_uuid_uuid_generate=yes
+else
+  ac_cv_lib_uuid_uuid_generate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_cv_lib_uuid_uuid_generate" >&5
+$as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBUUID 1
+_ACEOF
+
+  LIBS="-luuid $LIBS"
+
+else
+  as_fn_error $? "cannot link with -luuid, install uuid-dev." "$LINENO" 5
+fi
+
+            ;;
+        esac
         # Define on FreeBSD to enable all library features
         CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
 
--- zeromq-2.1.7.orig/configure.in
+++ zeromq-2.1.7/configure.in
@@ -116,6 +116,12 @@ case "${host_os}" in
         fi
         ;;
     *freebsd*)
+        case "${host_os}" in
+            *kfreebsd*)
+            AC_CHECK_LIB(uuid, uuid_generate, ,
+                [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])])
+            ;;
+        esac
         # Define on FreeBSD to enable all library features
         CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
         AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS])
--- zeromq-2.1.7.orig/src/uuid.hpp
+++ zeromq-2.1.7/src/uuid.hpp
@@ -25,7 +25,11 @@
 #include "stdint.hpp"
 
 #if defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD
+#if defined __GLIBC__
+#include <uuid/uuid.h>
+#else
 #include <uuid.h>
+#endif
 #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_SOLARIS ||\
       defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN
 #include <uuid/uuid.h>
--- zeromq-2.1.7.orig/src/uuid.cpp
+++ zeromq-2.1.7/src/uuid.cpp
@@ -44,7 +44,7 @@ const char *zmq::uuid_t::to_string ()
     return (char*) string_buf;
 }
 
-#elif defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD
+#elif (defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD) && ! defined 
__GLIBC__
 
 #include <stdlib.h>
 #include <uuid.h>
@@ -71,7 +71,7 @@ const char *zmq::uuid_t::to_string ()
 }
 
 #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_SOLARIS ||\
-      defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN
+      defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_CYGWIN || defined __GLIBC__
 
 #include <uuid/uuid.h>
 


-- 
9FED 5C6C E206 B70A 5857  70CA 9655 22B9 D49A E731
Debian Developer | Lisp Hacker | CaCert Assurer



--- End Message ---
--- Begin Message ---
Source: pyzmq
Source-Version: 2.1.9-1

We believe that the bug you reported is fixed in the latest version of
pyzmq, which is due to be installed in the Debian FTP archive:

python-zmq-dbg_2.1.9-1_amd64.deb
  to main/p/pyzmq/python-zmq-dbg_2.1.9-1_amd64.deb
python-zmq_2.1.9-1_amd64.deb
  to main/p/pyzmq/python-zmq_2.1.9-1_amd64.deb
pyzmq_2.1.9-1.debian.tar.gz
  to main/p/pyzmq/pyzmq_2.1.9-1.debian.tar.gz
pyzmq_2.1.9-1.dsc
  to main/p/pyzmq/pyzmq_2.1.9-1.dsc
pyzmq_2.1.9.orig.tar.gz
  to main/p/pyzmq/pyzmq_2.1.9.orig.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Debian Python Modules Team <[email protected]> 
(supplier of updated pyzmq package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 23 Sep 2011 00:16:39 +0200
Source: pyzmq
Binary: python-zmq python-zmq-dbg
Architecture: source amd64
Version: 2.1.9-1
Distribution: unstable
Urgency: low
Maintainer: Debian Python Modules Team 
<[email protected]>
Changed-By: Debian Python Modules Team 
<[email protected]>
Description: 
 python-zmq - Python bindings for 0MQ library
 python-zmq-dbg - Python bindings for 0MQ library - debugging files
Closes: 637777
Changes: 
 pyzmq (2.1.9-1) unstable; urgency=low
 .
   * New upstream version
     - should build on kFreeBSD without patches (Closes: #637777).
   * Build-depend on zeromq 2.1.9
Checksums-Sha1: 
 c4f7d2047930377a09b39e6a3825d246e2e5de24 2119 pyzmq_2.1.9-1.dsc
 41fc8a432677bc062d4bd45f6e72511f650e5a4a 329907 pyzmq_2.1.9.orig.tar.gz
 9dea6041ff3b2d026d871159f0f129a711993a8b 3761 pyzmq_2.1.9-1.debian.tar.gz
 825ad756a1c030c2f99ad7a1660fae01979c585c 385174 python-zmq_2.1.9-1_amd64.deb
 0b35385cf323e63b73bf98d19a17cfa9ea44ecef 1113010 
python-zmq-dbg_2.1.9-1_amd64.deb
Checksums-Sha256: 
 9fde57649dd1b3e16740e5ac12dc8ef16fad440ed20e9065dc400445ea6e8fc7 2119 
pyzmq_2.1.9-1.dsc
 78cc07fc83c5db5d4bedfc80699f883f6a2030b5d06f105032f54002e381562b 329907 
pyzmq_2.1.9.orig.tar.gz
 455ddedc2a57ab20ab2c23bd6ae2155a82db745ad0d279f7112899338f4679d9 3761 
pyzmq_2.1.9-1.debian.tar.gz
 0a0e3c9b69c14f59fbee0067b37a91d132f2d91bda9ddfdc326ac984cf57aa11 385174 
python-zmq_2.1.9-1_amd64.deb
 4af3e786676633ed9eb553776a794b50091d353add291928f79609d3c76112c3 1113010 
python-zmq-dbg_2.1.9-1_amd64.deb
Files: 
 62d9f005568bfd47fdcb21272db041a0 2119 python optional pyzmq_2.1.9-1.dsc
 3fe26c5d9f5f9af367bf6b78163e7a74 329907 python optional pyzmq_2.1.9.orig.tar.gz
 150177fc4809d68774907fe18663dd3d 3761 python optional 
pyzmq_2.1.9-1.debian.tar.gz
 f7362da0acf12d88a3448bb6cac8983b 385174 python optional 
python-zmq_2.1.9-1_amd64.deb
 1988c25bb494aed949b3a25d124aad0c 1113010 debug extra 
python-zmq-dbg_2.1.9-1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOf4dNAAoJEOs2Fxpv+UNfifMQAKgoVp6Dp6UsZf2jOsm/xn/n
mTWwBl5HzpJUofIjqZStryd1/aaVFktDNM13JCx1MXZF0Jg4hy3owXEgXOLxQ4n9
F/YM/kEdZeMFOKMSkTiY9liEBuT0RKaAGokbBccuaI5RYGDz6rhbvgGXthJo2bIA
NFSYbpWlJgyRWeXsJlNVyPuGV9hjwxKqd4UTqH+iIUEI2swZ7Pqk0cPgHNUM/6mc
XafpUeRmGuTtafpxlwaAY73cN6vgi1bJ+uzIPeAOZdrNMU5slkJVae4MTXJZb9rU
ddagb3Su1Yg+6fH12H8ONCPnJoUSclC1VV/CLlUiIrezR9vDlk3veqgOmlCILlm4
IPG+zPq++XrwYRUmrShkYYMLH4LEmFP5ZNKywNAA41J5UQnctkwnaWqU+mn5hhU7
GYnIxDToTfnJ6IAshabYyfBi1ni+TDtYT3pk12j4PsIsdHZnZRkmhxYqN/eU5aI4
PDElrJuX0m3hGqkolswS/xVPaUYxYSWcepK6ImdnSmre45BUDjNoW/ImmQ8F+4O4
kRBR0Pbbqe8gPEoyrM9U6YVvHkf4RdTdpmwCztJR+319GUXR71bqiXUgy5+rD4NP
Z5gyFfp8/EJJ6ei+3f8AK/ruSdEwdUF5nb7/5BBij19CGg7NYWyEd/lmOJLh6T2B
IpKFnMl/za21sTSic74v
=ND84
-----END PGP SIGNATURE-----



--- End Message ---
_______________________________________________
Python-modules-team mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/python-modules-team

Reply via email to