zeromq: bump version.

This commit is contained in:
Jerome Duval
2017-08-31 18:48:08 +02:00
parent a6fc385d40
commit 915aafa30e
3 changed files with 28 additions and 41 deletions

View File

@@ -1,36 +0,0 @@
From c7fd95dbd48ddffaf5477cd4b831a6cdbb4f9008 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 18 Apr 2017 21:52:36 +0200
Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index 915d795..61d1426 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,6 +212,9 @@ case "${host_os}" in
LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized])
AC_LANG_POP([C++])
;;
+ *haiku*)
+ AC_DEFINE(ZMQ_HAVE_HAIKU, 1, [Have Haiku OS])
+ ;;
*netbsd*)
# Define on NetBSD to enable all library features
CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS"
diff --git a/src/ip.cpp b/src/ip.cpp
index a2a8582..4242ae5 100644
--- a/src/ip.cpp
+++ b/src/ip.cpp
@@ -174,7 +174,7 @@ void zmq::set_ip_type_of_service (fd_t s_, int iptos)
#endif
// Windows does not support IPV6_TCLASS
-#ifndef ZMQ_HAVE_WINDOWS
+#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_HAIKU)
rc = setsockopt(
s_,
IPPROTO_IPV6,
--
2.12.2

View File

@@ -0,0 +1,23 @@
From 96b2fedfdc50b3a03fcbe7b4218177530d206cb8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 18 Apr 2017 21:52:36 +0200
Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index 0f19396..3eda103 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,9 @@ case "${host_os}" in
LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Wno-uninitialized])
AC_LANG_POP([C++])
;;
+ *haiku*)
+ AC_DEFINE(ZMQ_HAVE_HAIKU, 1, [Have Haiku OS])
+ ;;
*netbsd*)
# Define on NetBSD to enable all library features
CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS"
--
2.13.1

View File

@@ -18,9 +18,9 @@ COPYRIGHT="2007-2014 iMatix Corporation
LICENSE="GNU LGPL v3"
REVISION="1"
SOURCE_URI="https://github.com/zeromq/libzmq/releases/download/v$portVersion/zeromq-$portVersion.tar.gz"
CHECKSUM_SHA256="27d1e82a099228ee85a7ddb2260f40830212402c605a4a10b5e5498a7e0e9d03"
SOURCE_URI_2="https://raw.githubusercontent.com/zeromq/cppzmq/1fdf3d1/zmq.hpp#noarchive"
CHECKSUM_SHA256_2="88d5978e7c7220e71aa7aa255081e7e01502d18d89f2eb9d42b96a43bb642293"
CHECKSUM_SHA256="5b23f4ca9ef545d5bd3af55d305765e3ee06b986263b31967435d285a3e6df6b"
SOURCE_URI_2="https://raw.githubusercontent.com/zeromq/cppzmq/b0e6d4b/zmq.hpp#noarchive"
CHECKSUM_SHA256_2="02b73219656df3ffe3b231c7d0326e754a738ef2a83c8e94cd1e47d22cdd9535"
PATCHES="zeromq-$portVersion.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
@@ -29,7 +29,7 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
PROVIDES="
zeromq$secondaryArchSuffix = $portVersion
cmd:curve_keygen$secondaryArchSuffix
lib:libzmq$secondaryArchSuffix = 5.1.1 compat >= 5
lib:libzmq$secondaryArchSuffix = 5.1.2 compat >= 5
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -37,7 +37,7 @@ REQUIRES="
PROVIDES_devel="
zeromq${secondaryArchSuffix}_devel = $portVersion
devel:libzmq$secondaryArchSuffix = 5.1.1 compat >= 5
devel:libzmq$secondaryArchSuffix = 5.1.2 compat >= 5
"
REQUIRES_devel="
zeromq$secondaryArchSuffix == $portVersion base