generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-19 08:46:44 +01:00
Code Issues Projects Releases Wiki Activity

Problem: passing tests on debian/kfreebsd marked as XFAIL

Browse Source 
Solution: use a different system variable for debian/hurd and
debian/kfreebsd so that the tests are skipped only on hurd.
This commit is contained in:
Luca Boccassi 2018-11-04 18:12:55 +00:00
parent 205573f1a3
commit 54295cb342
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -303,6 +303,12 @@ src_libzmq_la_LDFLAGS = \
@LIBZMQ_EXTRA_LDFLAGS@ \ @LIBZMQ_EXTRA_LDFLAGS@ \
-Wl,--version-script=$(srcdir)/src/libzmq.vers -Wl,--version-script=$(srcdir)/src/libzmq.vers
else 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 = \ src_libzmq_la_LDFLAGS = \
-version-info @LTVER@ \ -version-info @LTVER@ \
@LIBZMQ_EXTRA_LDFLAGS@ \ @LIBZMQ_EXTRA_LDFLAGS@ \
@ -312,6 +318,7 @@ endif
endif endif
endif endif
endif endif
endif
src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS) src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS)
src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS) src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS)

4
configure.ac
View File

@ -155,6 +155,7 @@ libzmq_on_cygwin="no"
libzmq_on_android="no" libzmq_on_android="no"
libzmq_on_linux="no" libzmq_on_linux="no"
libzmq_on_gnu="no" libzmq_on_gnu="no"
libzmq_on_debian_kfreebsd="no"
# Set some default features required by ZeroMQ code # Set some default features required by ZeroMQ code
CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE -Wno-long-long $CPPFLAGS" CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE -Wno-long-long $CPPFLAGS"
@ -210,7 +211,7 @@ case "${host_os}" in
case "${host_os}" in case "${host_os}" in
# On Debian/kFreeBSD with gnu set the --version-script flag # On Debian/kFreeBSD with gnu set the --version-script flag
kfreebsd*-gnu*) kfreebsd*-gnu*)
libzmq_on_gnu="yes" libzmq_on_debian_kfreebsd="yes"
;; ;;
esac esac
CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS" 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_ANDROID, test "x$libzmq_on_android" = "xyes")
AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes") AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "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 # Check for __atomic_Xxx compiler intrinsics
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])