cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 23:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

zmq: Make 2 variants, refresh patches, fix C++ build issues

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess
2015-07-04 10:46:53 -04:00
committed by Alex R
parent 4b1cf93c0e
commit 9ea5f365f6
5 changed files with 125 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/zmq/patches/disable_pedantic_on_linux_with_ulibc++.patch → libs/zmq/patches/010-disable_pedantic_on_linux_with_ulibc++.patch
+3 -3
View File
@@ -1,6 +1,6 @@
--- a/configure.ac 2014-06-04 10:19:35.140061796 +0800
+++ b/configure.ac 2014-06-04 11:08:17.231997926 +0800
@@ -127,8 +127,10 @@
--- a/configure.ac
+++ b/configure.ac
@@ -147,8 +147,10 @@ case "${host_os}" in
*linux*)
# Define on Linux to enable all library features. Define if using a gnu compiler
if test "x$GXX" = "xyes"; then
libs/zmq/patches/map_with_const_string_with_ublic++.patch → libs/zmq/patches/020-map_with_const_string_with_ublic++.patch
+9 -9
View File
@@ -1,6 +1,6 @@
--- a/src/metadata.hpp 2015-06-17 21:39:33.629934688 +0800
+++ b/src/metadata.hpp 2014-10-14 22:07:36.000000000 +0800
@@ -31,7 +31,7 @@
--- a/src/metadata.hpp
+++ b/src/metadata.hpp
@@ -31,7 +31,7 @@ namespace zmq
{
public:
@@ -9,8 +9,8 @@
metadata_t (const dict_t &dict);
virtual ~metadata_t ();
--- a/src/socket_base.cpp 2015-06-17 21:42:26.289413233 +0800
+++ b/src/socket_base.cpp 2015-06-02 18:31:00.000000000 +0800
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -20,6 +20,7 @@
#include <new>
#include <string>
@@ -19,9 +19,9 @@
#include "platform.hpp"
--- a/src/stream_engine.cpp 2015-06-17 21:57:29.599443517 +0800
+++ b/src/stream_engine.cpp 2015-06-02 18:31:00.000000000 +0800
@@ -198,7 +198,7 @@
--- a/src/stream_engine.cpp
+++ b/src/stream_engine.cpp
@@ -198,7 +198,7 @@ void zmq::stream_engine_t::plug (io_thre
// Compile metadata.
typedef metadata_t::dict_t properties_t;
properties_t properties;
@@ -30,7 +30,7 @@
zmq_assert (metadata == NULL);
metadata = new (std::nothrow) metadata_t (properties);
}
@@ -805,7 +805,7 @@
@@ -805,7 +805,7 @@ void zmq::stream_engine_t::mechanism_rea
// If we have a peer_address, add it to metadata
if (!peer_address.empty()) {
libs/zmq/patches/streamoff_missing_with_ulibc++.patch → libs/zmq/patches/030-streamoff_missing_with_ulibc++.patch
+2 -2
View File
@@ -1,5 +1,5 @@
--- a/src/blob.hpp 2014-06-04 10:19:12.680062287 +0800
+++ b/src/blob.hpp 2014-06-04 10:30:31.168047457 +0800
--- a/src/blob.hpp
+++ b/src/blob.hpp
@@ -21,6 +21,7 @@
#define __ZMQ_BLOB_HPP_INCLUDED__
libs/zmq/patches/100-fix-cxx-include-order.patch
+84
View File
@@ -0,0 +1,84 @@
--- a/src/mtrie.cpp
+++ b/src/mtrie.cpp
@@ -17,11 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-
#include <new>
#include <algorithm>
+#include <stdlib.h>
+
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
--- a/src/raw_encoder.cpp
+++ b/src/raw_encoder.cpp
@@ -17,6 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <basic_definitions>
+#include <exception>
+#include <cstddef>
+#include <algorithm>
+
#include "encoder.hpp"
#include "raw_encoder.hpp"
#include "likely.hpp"
--- a/src/trie.cpp
+++ b/src/trie.cpp
@@ -17,11 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdlib.h>
-
#include <new>
#include <algorithm>
+#include <stdlib.h>
+
#include "platform.hpp"
#if defined ZMQ_HAVE_WINDOWS
#include "windows.hpp"
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -29,7 +29,6 @@
#include <stddef.h>
#include <string.h>
#include <stdlib.h>
-#include <algorithm>
#include "err.hpp"
#include "msg.hpp"
--- a/src/v1_encoder.cpp
+++ b/src/v1_encoder.cpp
@@ -17,6 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <basic_definitions>
+#include <exception>
+#include <cstddef>
+#include <algorithm>
+
#include "encoder.hpp"
#include "v1_encoder.hpp"
#include "likely.hpp"
--- a/src/v2_encoder.cpp
+++ b/src/v2_encoder.cpp
@@ -17,6 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <basic_definitions>
+#include <exception>
+#include <cstddef>
+#include <algorithm>
+
#include "v2_protocol.hpp"
#include "v2_encoder.hpp"
#include "likely.hpp"