3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 07:16:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #496 from amuraru/master

Browse Source 
Fixed el5/el6 deps in RPM spec file / newline fix
This commit is contained in:
Pieter Hintjens 2013-01-12 08:33:33 -08:00
commit c2fbb722a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builds/redhat/zeromq.spec.in
View File

@ -11,12 +11,15 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc, make, gcc-c++, libstdc++-devel BuildRequires: gcc, make, gcc-c++, libstdc++-devel
Requires: libstdc++ Requires: libstdc++
%if %{?rhel}%{!?rhel:0} >= 6 %if 0%{?rhel}
%if 0%{?rhel} == 6
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
Requires: libuuid Requires: libuuid
%elseif %{?rhel}%{!?rhel:0} >= 5 %endif
%if 0%{?rhel} == 5
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
Requires: e2fsprogs Requires: e2fsprogs
%endif
%else %else
BuildRequires: uuid-devel BuildRequires: uuid-devel
Requires: uuid Requires: uuid
@ -57,7 +60,7 @@ This package contains ZeroMQ related development libraries and header files.
%build %build
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
%configure --with-pgm %configure --with-pgm --with-pic --with-gnu-ld
%else %else
%configure %configure
%endif %endif

3
tests/test_disconnect_inproc.cpp
View File

@ -116,4 +116,5 @@ int main(int argc, char** argv) {
zmq_ctx_destroy(context); zmq_ctx_destroy(context);
return 0; return 0;
} }