From 54295cb342e70577f705f6d7bb3f39f6338d3e5b Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sun, 4 Nov 2018 18:12:55 +0000
Subject: [PATCH] Problem: passing tests on debian/kfreebsd marked as XFAIL

Solution: use a different system variable for debian/hurd and
debian/kfreebsd so that the tests are skipped only on hurd.
---
 Makefile.am  | 7 +++++++
 configure.ac | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index d9ad16b6..1ff7ff07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -303,6 +303,12 @@ src_libzmq_la_LDFLAGS = \
 	@LIBZMQ_EXTRA_LDFLAGS@ \
 	-Wl,--version-script=$(srcdir)/src/libzmq.vers
 else
+if ON_DEBIAN_KFREEBSD
+src_libzmq_la_LDFLAGS = \
+	-version-info @LTVER@ \
+	@LIBZMQ_EXTRA_LDFLAGS@ \
+	-Wl,--version-script=$(srcdir)/src/libzmq.vers
+else
 src_libzmq_la_LDFLAGS = \
 	-version-info @LTVER@ \
 	@LIBZMQ_EXTRA_LDFLAGS@ \
@@ -312,6 +318,7 @@ endif
 endif
 endif
 endif
+endif
 
 src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS)
 src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS)
diff --git a/configure.ac b/configure.ac
index 2e323b6b..00b3b7a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,7 @@ libzmq_on_cygwin="no"
 libzmq_on_android="no"
 libzmq_on_linux="no"
 libzmq_on_gnu="no"
+libzmq_on_debian_kfreebsd="no"
 
 # Set some default features required by ZeroMQ code
 CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE -Wno-long-long $CPPFLAGS"
@@ -210,7 +211,7 @@ case "${host_os}" in
         case "${host_os}" in
             # On Debian/kFreeBSD with gnu set the --version-script flag
             kfreebsd*-gnu*)
-                libzmq_on_gnu="yes"
+                libzmq_on_debian_kfreebsd="yes"
             ;;
         esac
         CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
@@ -617,6 +618,7 @@ AM_CONDITIONAL(ON_CYGWIN, test "x$libzmq_on_cygwin" = "xyes")
 AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
 AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
 AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "xyes")
+AM_CONDITIONAL(ON_DEBIAN_KFREEBSD, test "x$libzmq_on_debian_kfreebsd" = "xyes")
 
 # Check for __atomic_Xxx compiler intrinsics
 AC_LANG_PUSH([C++])