On Tue, 2016-01-19 at 13:05 +0100, Svante Signell wrote:
> On Tue, 2015-10-06 at 12:33 +0200, Svante Signell wrote:
> > tags 799235 patch
> > usertag 799235 hurd
> > user [email protected]
> > thanks
> >
> > Source: zeromq3
> > Version: 4.0.5+dfsg-3
> > Severity: important
> > Justification: fails to build from source
> Additionally, until upstream makes a new release, do you think it is possible
> to add the patch to the Debian package so that packages reverse-depending on
> it can be built?
Hello again, attached is an updated patch based on master at github. With these
modifications also version 4.1.2 from experimental almost builds. Some further
patches are needed for a successful build and the testsuite to pass.
Thanks!
diff --git a/configure.ac b/configure.ac
index 589f90d..cbc4017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,20 +146,6 @@ CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
# For host type checks
AC_CANONICAL_HOST
-#For a working getsockopt() optname=SO_ERROR
-dnl AC_MSG_CHECKING([for getsockopt optname SO_ERROR)])
-dnl AC_TRY_COMPILE([
-dnl #include <sys/types.h>
-dnl #include <sys/socket.h>
-dnl ], [socklen_t t;], ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)
-dnl if test "x$ac_cv_type_socklen_t" = "xyes"; then
-dnl AC_MSG_RESULT([yes])
-dnl AC_DEFINE(HAVE_SOCKLEN_T,1,
-dnl [Define if socklen_t is available])
-dnl else
-dnl AC_MSG_RESULT([no])
-dnl fi
-
# OS-specific tests
case "${host_os}" in
*linux*)
@@ -304,8 +290,6 @@ case "${host_os}" in
AC_DEFINE(ZMQ_HAVE_GNU, 1, [Have GNU/Hurd OS])
libzmq_on_gnu="yes"
AC_CHECK_LIB(rt, sem_init)
-dnl AC_CHECK_LIB(uuid, uuid_generate, ,
-dnl [AC_MSG_ERROR([cannot link with -luuid, install uuid-dev.])])
;;
*)
AC_MSG_ERROR([unsupported system: ${host_os}.])
diff --git a/src/poller.hpp b/src/poller.hpp
index f3d8d67..a87d509 100644
--- a/src/poller.hpp
+++ b/src/poller.hpp
@@ -49,12 +49,8 @@
#elif defined ZMQ_USE_SELECT
#include "select.hpp"
#elif defined ZMQ_HAVE_GNU
-#define ZMQ_USE_SELECT
-#include "select.hpp"
-#if 0
#define ZMQ_USE_POLL
#include "poll.hpp"
-#endif
#else
#error None of the ZMQ_USE_* macros defined
#endif
