mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-19 00:46:05 +01:00
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.
This commit is contained in:
parent
205573f1a3
commit
54295cb342
@ -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)
|
||||
|
@ -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++])
|
||||
|
Loading…
x
Reference in New Issue
Block a user