thirdparty/libzmq: 4.3.5

thirdparty/libzmq/CMakeLists.txt

@@ -1,5 +1,4 @@
 list(APPEND PATCH_FILES
-    android.patch
     cmake_tweaks.patch
 )
 
@@ -33,11 +32,11 @@ list(APPEND BUILD_CMD COMMAND ninja)
 
 list(APPEND INSTALL_CMD COMMAND ${CMAKE_COMMAND} --install .)
 
-append_shared_lib_install_commands(INSTALL_CMD zmq VERSION 4)
+append_shared_lib_install_commands(INSTALL_CMD zmq VERSION 5)
 
 external_project(
-    DOWNLOAD GIT 883e95b22e0bffffa72312ea1fec76199afbe458
-    https://github.com/zeromq/libzmq
+    DOWNLOAD URL ae933b1e98411fd7cb8309f9502d2737
+    https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz
     PATCH_FILES ${PATCH_FILES}
     CMAKE_ARGS ${CMAKE_ARGS}
     BUILD_COMMAND ${BUILD_CMD}

thirdparty/libzmq/cmake_tweaks.patch

@@ -1,49 +1,12 @@
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # CMake build script for ZeroMQ
-
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.15)
- project(ZeroMQ)
-
- option(WITH_OPENPGM "Build with support for OpenPGM" OFF)
-@@ -125,8 +125,6 @@ check_library_exists(iphlpapi printf "" HAVE_IPHLAPI) # GetAdaptersAddresses
- check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED)
- check_cxx_symbol_exists(LOCAL_PEERCRED sys/socket.h ZMQ_HAVE_LOCAL_PEERCRED)
-
--find_library(RT_LIBRARY rt)
--
- find_package(Threads)
-
-
-@@ -266,10 +264,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-   add_definitions(-D_DARWIN_C_SOURCE)
- endif()
-
--set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4)
--find_package(PythonInterp)
--find_package(AsciiDoc)
--
- cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON
-                        "PYTHON_FOUND;ASCIIDOC_FOUND" OFF)
-
-@@ -609,6 +603,7 @@ else()
-     else()
-       set_target_properties(libzmq PROPERTIES
-                              OUTPUT_NAME "zmq"
-+                             VERSION 4
-                              PUBLIC_HEADER "${public_headers}")
-     endif()
- endif()
-@@ -628,8 +623,8 @@ if(HAVE_IPHLAPI)
-   target_link_libraries(libzmq iphlpapi)
- endif()
-
--if(RT_LIBRARY)
--  target_link_libraries(libzmq ${RT_LIBRARY})
-+if(HAVE_CLOCK_GETTIME)
-+  target_link_libraries(libzmq -lrt)
- endif()
-
- set(perf-tools local_lat
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0346227..7003fe2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1508,7 +1508,7 @@ if(BUILD_SHARED)
+     target_link_libraries(libzmq iphlpapi)
+   endif()
+
+-  if(RT_LIBRARY)
++  if(RT_LIBRARY AND HAVE_CLOCK_GETTIME)
+     target_link_libraries(libzmq -lrt)
+   endif()