Pārlūkot izejas kodu

cppzmq add 4.10.0 (#2261)

* cppzmq add 4.10.0

* zeromq: Disable Werror

* Update xmake.lua

* zeromq: Fix compilation with later C++ standards

* Update xmake.lua

---------

Co-authored-by: Jérôme Leclercq <[email protected]>
young.day 2 gadi atpakaļ
vecāks
revīzija
78d39575fd
2 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 1 0
      packages/c/cppzmq/xmake.lua
  2. 4 3
      packages/z/zeromq/xmake.lua

+ 1 - 0
packages/c/cppzmq/xmake.lua

@@ -8,6 +8,7 @@ package("cppzmq")
     add_urls("https://github.com/zeromq/cppzmq/archive/refs/tags/$(version).tar.gz",
              "https://github.com/zeromq/cppzmq.git")
     add_versions("v4.8.1", "7a23639a45f3a0049e11a188e29aaedd10b2f4845f0000cf3e22d6774ebde0af")
+    add_versions("v4.10.0", "c94c20743ed7d4aa37835a5c46567ab0790d4acc")
 
     add_deps("cmake", "zeromq")
     on_install("windows", "macosx", "linux", function (package)

+ 4 - 3
packages/z/zeromq/xmake.lua

@@ -1,5 +1,4 @@
 package("zeromq")
-
     set_homepage("https://zeromq.org/")
     set_description("High-performance, asynchronous messaging library")
     set_license("GPL-3.0")
@@ -9,6 +8,8 @@ package("zeromq")
     add_versions("4.3.2", "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763")
     add_versions("4.3.4", "c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5")
 
+    add_patches("4.3.4", "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch", "08f8068e109225ff628f9205597b917f633f02bc0be9382b06fbd98b0de2f8a0")
+
     if is_plat("linux") then
         add_configs("libunwind", {description = "Enable libunwind.", default = false, type = "boolean"})
     end
@@ -30,7 +31,7 @@ package("zeromq")
 
     on_install("windows", function (package)
         io.replace("CMakeLists.txt", "NOT ${CMAKE_BUILD_TYPE} MATCHES \"Debug\"", "FALSE", {plain = true})
-        local configs = {"-DBUILD_TESTS=OFF"}
+        local configs = {"-DBUILD_TESTS=OFF", "-DLIBZMQ_WERROR=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON"))
         table.insert(configs, "-DBUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF"))
@@ -38,7 +39,7 @@ package("zeromq")
     end)
 
     on_install("linux", "macosx", function (package)
-        local configs = {"--disable-dependency-tracking", "--without-docs", "--enable-libbsd=no"}
+        local configs = {"--disable-dependency-tracking", "--without-docs", "--enable-libbsd=no", "--disable-Werror"}
         table.insert(configs, "--enable-static=" .. (package:config("shared") and "no" or "yes"))
         table.insert(configs, "--enable-shared=" .. (package:config("shared") and "yes" or "no"))
         table.insert(configs, "--enable-libunwind=" .. (package:config("libunwind") and "yes" or "no"))