From 73f770a1de881331ad2934f8386dffddcd2fd703 Mon Sep 17 00:00:00 2001
From: Artem Pikulin <ortgma@gmail.com>
Date: Tue, 20 Mar 2018 20:39:03 +0700
Subject: [PATCH] Use static nanomsg build for libcrypto777.

---
 CMakeLists.txt                  |  2 +-
 crypto777/CMakeLists.txt        |  2 +-
 crypto777/iguana_utils.c        | 24 ++++++++++++------------
 iguana/exchanges/CMakeLists.txt |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f37d6a291..173fb54da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ download_project(PROJ nanomsg
         GIT_TAG         1.1.2
         GIT_SHALLOW     1
         GIT_PROGRESS    1
-        CMAKE_ARGS      "-DNN_STATIC_LIB=ON -DNN_ENABLE_DOC=OFF -DNN_TESTS=OFF -DNN_TOOLS=OFF -DNN_ENABLE_NANOCAT=OFF -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_PREFIX}"
+        CMAKE_ARGS      "-DNN_STATIC_LIB=ON -DNN_ENABLE_GETADDRINFO_A=OFF -DNN_ENABLE_DOC=OFF -DNN_TESTS=OFF -DNN_TOOLS=OFF -DNN_ENABLE_NANOCAT=OFF -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_PREFIX}"
         UPDATE_DISCONNECTED 1
         )
 
diff --git a/crypto777/CMakeLists.txt b/crypto777/CMakeLists.txt
index 6d49234b3..dbe0cf18d 100644
--- a/crypto777/CMakeLists.txt
+++ b/crypto777/CMakeLists.txt
@@ -2,4 +2,4 @@ file(GLOB sources "*.c")
 file(GLOB headers "*.h")
 add_library(libcrypto777 ${sources} ${headers})
 target_compile_definitions(libcrypto777 PRIVATE USE_STATIC_NANOMSG)
-target_link_libraries(libcrypto777 PUBLIC curl)
\ No newline at end of file
+target_link_libraries(libcrypto777 PUBLIC curl ${NANOMSG_LIBRARY})
\ No newline at end of file
diff --git a/crypto777/iguana_utils.c b/crypto777/iguana_utils.c
index 4605c2f4e..645baefea 100755
--- a/crypto777/iguana_utils.c
+++ b/crypto777/iguana_utils.c
@@ -799,23 +799,23 @@ int32_t nn_base64_decode (const char *in, size_t in_len,uint8_t *out, size_t out
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
         0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
-    
+
     for (io = 0, ii = 0, v = 0, rem = 0; ii < in_len; ii++) {
         if (isspace ((uint32_t)in [ii]))
             continue;
-        
+
         if (in [ii] == '=')
             break;
-        
+
         ch = DECODEMAP [(uint32_t)in [ii]];
-        
+
         // Discard invalid characters as per RFC 2045.
         if (ch == 0xFF)
             break;
-        
+
         v = (v << 6) | ch;
         rem += 6;
-        
+
         if (rem >= 8) {
             rem -= 8;
             if (io >= out_len)
@@ -839,7 +839,7 @@ int32_t nn_base64_encode (const uint8_t *in, size_t in_len,char *out, size_t out
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "abcdefghijklmnopqrstuvwxyz"
     "0123456789+/";
-    
+
     for (io = 0, ii = 0, v = 0, rem = 0; ii < in_len; ii++) {
         ch = in [ii];
         v = (v << 8) | ch;
@@ -851,26 +851,26 @@ int32_t nn_base64_encode (const uint8_t *in, size_t in_len,char *out, size_t out
             out [io++] = ENCODEMAP [(v >> rem) & 63];
         }
     }
-    
+
     if (rem) {
         v <<= (6 - rem);
         if (io >= out_len)
             return -ENOBUFS;
         out [io++] = ENCODEMAP [v & 63];
     }
-    
+
     //  Pad to a multiple of 3
     while (io & 3) {
         if (io >= out_len)
             return -ENOBUFS;
         out [io++] = '=';
     }
-    
+
     if (io >= out_len)
         return -ENOBUFS;
-    
+
     out [io] = '\0';
-    
+
     return io;
 }
 
diff --git a/iguana/exchanges/CMakeLists.txt b/iguana/exchanges/CMakeLists.txt
index 2aa749888..d5c1613f2 100644
--- a/iguana/exchanges/CMakeLists.txt
+++ b/iguana/exchanges/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 set(MM_SOURCES mm.c ../mini-gmp.c ../groestl.c ../segwit_addr.c ../keccak.c LP_etomic.c)
-set(MM_LIBS ${NANOMSG_LIBRARY} curl pthread libcrypto777 libjpeg libsecp256k1)
+set(MM_LIBS curl pthread libcrypto777 libjpeg libsecp256k1)
 add_executable(marketmaker-testnet ${MM_SOURCES})
 add_executable(marketmaker-mainnet ${MM_SOURCES})
 include_directories(../../crypto777)