From acabcd4c23f805d4ba0df966cfd36cd0ee7103a0 Mon Sep 17 00:00:00 2001
From: Amol Bhave <amol@amolbhave.com>
Date: Fri, 19 Apr 2019 07:33:25 -0700
Subject: [PATCH] zmq: Fix compilation for c++ stdlib

Compilation for the zmq lib is broken for c++ stdlib in openwrt since the
patches add uclibc++ specific code.

This diffs changes the patch to only include the code conditioned
on if we are actually using uclibc++.

Signed-off-by: Amol Bhave <amol@amolbhave.com>
---
 libs/zmq/Makefile                             |  2 +-
 ...0-map_with_const_string_with_ublic++.patch | 21 +++--
 .../patches/100-fix-cxx-include-order.patch   | 84 -------------------
 3 files changed, 16 insertions(+), 91 deletions(-)
 delete mode 100644 libs/zmq/patches/100-fix-cxx-include-order.patch

diff --git a/libs/zmq/Makefile b/libs/zmq/Makefile
index 290eef50d2..2d21be000f 100644
--- a/libs/zmq/Makefile
+++ b/libs/zmq/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zeromq
 PKG_VERSION:=4.1.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=LICENCE.txt
diff --git a/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch b/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch
index d97a3eb465..8a47aa1ad0 100644
--- a/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch
+++ b/libs/zmq/patches/020-map_with_const_string_with_ublic++.patch
@@ -1,11 +1,14 @@
 --- a/src/metadata.hpp
 +++ b/src/metadata.hpp
-@@ -41,7 +41,7 @@ namespace zmq
+@@ -41,7 +41,11 @@ namespace zmq
      {
          public:
  
--            typedef std::map <std::string, const std::string> dict_t;
++#ifdef __UCLIBCXX_MAJOR__
 +            typedef std::map <std::string, std::string> dict_t;
++#else
+             typedef std::map <std::string, const std::string> dict_t;
++#endif
  
              metadata_t (const dict_t &dict);
              virtual ~metadata_t ();
@@ -21,21 +24,27 @@
  
 --- a/src/stream_engine.cpp
 +++ b/src/stream_engine.cpp
-@@ -208,7 +208,7 @@ void zmq::stream_engine_t::plug (io_thread_t *io_thread_,
+@@ -208,7 +208,11 @@ void zmq::stream_engine_t::plug (io_thread_t *io_thread_,
              //  Compile metadata.
              typedef metadata_t::dict_t properties_t;
              properties_t properties;
--            properties.insert(std::make_pair("Peer-Address", peer_address));
++#ifdef __UCLIBCXX_MAJOR__
 +            properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
++#else
+             properties.insert(std::make_pair("Peer-Address", peer_address));
++#endif
              zmq_assert (metadata == NULL);
              metadata = new (std::nothrow) metadata_t (properties);
          }
-@@ -815,7 +815,7 @@ void zmq::stream_engine_t::mechanism_ready ()
+@@ -815,7 +815,11 @@ void zmq::stream_engine_t::mechanism_ready ()
  
      //  If we have a peer_address, add it to metadata
      if (!peer_address.empty()) {
--        properties.insert(std::make_pair("Peer-Address", peer_address));
++#ifdef __UCLIBCXX_MAJOR__
 +        properties.insert(std::make_pair<std::string, std::string>("Peer-Address", peer_address));
++#else
+         properties.insert(std::make_pair("Peer-Address", peer_address));
++#endif
      }
  
      //  Add ZAP properties.
diff --git a/libs/zmq/patches/100-fix-cxx-include-order.patch b/libs/zmq/patches/100-fix-cxx-include-order.patch
deleted file mode 100644
index 120e965958..0000000000
--- a/libs/zmq/patches/100-fix-cxx-include-order.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/src/mtrie.cpp
-+++ b/src/mtrie.cpp
-@@ -27,11 +27,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
-@@ -27,6 +27,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
-@@ -27,11 +27,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
-@@ -39,7 +39,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
-@@ -27,6 +27,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
-@@ -27,6 +27,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"
-- 
2.30.2