SHA256
1
0
forked from pool/zeromq

Accepting request 399056 from home:adamm:branches:devel:libraries:c_c++

- Added patch 3ad076.patch
  * based on https://github.com/zeromq/zeromq4-1/commit/3ad076.patch
  * refreshed and removed NEWS section
  * fixes unbinding when IPv6 is available
- Add '--disable-dependency-tracking' since we are not rebuilding
- Re-enable concurrent check target, but fall back to sequential on
  failure. This allows quick test building, while allows 
  sequential unit test run. Run tests 3x before 'official' failure as
  some are a little flaky (upstream acknowledges this)

- Append test_log in build output if there are failures

- Update to 4.1.4
  * fixed build failure with latest libsodium
  * handle IPv6 link local addresses
  * fixed assertion failure in msg.cpp:390 on STREAM sockets
  * fixed assertion failure in tcp.cpp after network reconnect
  * fixed socket monitor hang
- Remove libsodium-init.patch - upstreamed
- Run %check rule sequentially to prevent assert failures

OBS-URL: https://build.opensuse.org/request/show/399056
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zeromq?expand=0&rev=43
This commit is contained in:
2016-05-31 13:39:40 +00:00
committed by Git OBS Bridge
parent d32465c660
commit c2b417b022
6 changed files with 450 additions and 36 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package zeromq
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +21,14 @@
%define with_pgm 1
%endif
Name: zeromq
Version: 4.1.3
Version: 4.1.4
Release: 0
Summary: Lightweight messaging kernel
License: LGPL-3.0+
Group: Productivity/Networking/Web/Servers
Url: http://www.zeromq.org/
Source: http://download.zeromq.org/%{name}-%{version}.tar.gz
Patch1: libsodium-init.patch
Patch: 3ad076.patch
BuildRequires: asciidoc
BuildRequires: gcc-c++
BuildRequires: pkgconfig
@@ -110,7 +110,7 @@ This package holds the development files for ZeroMQ.
%prep
%setup -q
%patch1 -p1
%patch -p1
%build
%configure \
@@ -119,6 +119,7 @@ This package holds the development files for ZeroMQ.
--with-pgm \
%endif
--disable-static \
--disable-dependency-tracking \
--with-pic
make %{?_smp_mflags}
@@ -127,7 +128,8 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
find %{buildroot} -type f -name "*.la" -delete -print
%check
make check %{?_smp_mflags}
# Tests don't run well concurrently and some are flaky, hence 3x before fail
make check %{?_smp_mflags} || make check || make check || make check || (cat ./test-suite.log && false)
%post -n %{lib_name} -p /sbin/ldconfig