瀏覽代碼

update boost, poco and doxygen (#1369)

* update pybind11

* update boost

* update poco
Hoildkv 3 年之前
父節點
當前提交
79d16a0f24
共有 5 個文件被更改,包括 17 次插入4 次删除
  1. 1 0
      packages/b/boost/xmake.lua
  2. 1 1
      packages/e/eigen/xmake.lua
  3. 2 2
      packages/p/pcre2/xmake.lua
  4. 12 1
      packages/p/poco/xmake.lua
  5. 1 0
      packages/p/pybind11/xmake.lua

+ 1 - 0
packages/b/boost/xmake.lua

@@ -10,6 +10,7 @@ package("boost")
     add_urls("https://github.com/xmake-mirror/boost/releases/download/boost-$(version).tar.bz2", {version = function (version)
             return version .. "/boost_" .. (version:gsub("%.", "_"))
         end})
+    add_versions("1.79.0", "475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39")
     add_versions("1.78.0", "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc")
     add_versions("1.77.0", "fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854")
     add_versions("1.76.0", "f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41")

+ 1 - 1
packages/e/eigen/xmake.lua

@@ -6,7 +6,7 @@ package("eigen")
     set_license("MPL-2.0")
 
     add_urls("https://gitlab.com/libeigen/eigen/-/archive/$(version)/eigen-$(version).tar.bz2",
-             "https://gitlab.com/libeigen/eigen")
+             "https://gitlab.com/libeigen/eigen.git")
     add_versions("3.3.7", "685adf14bd8e9c015b78097c1dc22f2f01343756f196acdc76a678e1ae352e11")
     add_versions("3.3.8", "0215c6593c4ee9f1f7f28238c4e8995584ebf3b556e9dbf933d84feb98d5b9ef")
     add_versions("3.3.9", "0fa5cafe78f66d2b501b43016858070d52ba47bd9b1016b0165a7b8e04675677")

+ 2 - 2
packages/p/pcre2/xmake.lua

@@ -4,13 +4,13 @@ package("pcre2")
     set_description("A Perl Compatible Regular Expressions Library")
 
     set_urls("https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(version)/pcre2-$(version).tar.gz")
-
+    add_versions("10.40", "ded42661cab30ada2e72ebff9e725e745b4b16ce831993635136f2ef86177724")
     add_versions("10.39", "0781bd2536ef5279b1943471fdcdbd9961a2845e1d2c9ad849b9bd98ba1a9bd4")
 
     add_deps("cmake")
 
     if not is_plat("iphoneos") then
-        add_configs("jit", {description = "Enable jit.", default = true, type = "boolean"})
+        add_configs("jit", {description = "Enable jit.", default = not is_plat("wasm"), type = "boolean"})
     end
     add_configs("bitwidth", {description = "Set the code unit width.", default = "8", values = {"8", "16", "32"}})
 

+ 12 - 1
packages/p/poco/xmake.lua

@@ -8,6 +8,7 @@ package("poco")
              "https://github.com/pocoproject/poco.git")
     add_versions("1.11.0", "8a7bfd0883ee95e223058edce8364c7d61026ac1882e29643822ce9b753f3602")
     add_versions("1.11.1", "2412a5819a239ff2ee58f81033bcc39c40460d7a8b330013a687c8c0bd2b4ac0")
+    add_versions("1.12.1", "debc6d5d5eb946bb14e47cffc33db4fffb4f11765f34f8db04e71e866d1af8f9")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
@@ -17,7 +18,7 @@ package("poco")
     add_configs("odbc", {description = "Enable odbc support.", default = is_plat("windows"), type = "boolean"})
 
     add_deps("cmake")
-    add_deps("openssl", "pcre", "sqlite3", "expat", "zlib")
+    add_deps("openssl", "sqlite3", "expat", "zlib")
     add_defines("POCO_NO_AUTOMATIC_LIBS")
 
     on_load("windows", "linux", "macosx", function (package)
@@ -27,6 +28,11 @@ package("poco")
         if package:config("mysql") then
             package:add("deps", "mysql")
         end
+        if package:version():ge("1.12.0") then
+            package:add("deps", "pcre2")
+        else
+            package:add("deps", "pcre")
+        end
     end)
 
     on_install("windows", "linux", "macosx", function (package)
@@ -34,6 +40,11 @@ package("poco")
         io.replace("XML/CMakeLists.txt", "EXPAT::EXPAT", "expat::expat")
         io.replace("XML/CMakeLists.txt", "PUBLIC POCO_UNBUNDLED", "PUBLIC POCO_UNBUNDLED XML_DTD XML_NS")
         io.replace("Foundation/CMakeLists.txt", "PUBLIC POCO_UNBUNDLED", "PUBLIC POCO_UNBUNDLED PCRE_STATIC")
+        io.replace("Foundation/CMakeLists.txt", "POCO_SOURCES%(SRCS RegExp.-%)", "")
+        if package:version():ge("1.12.0") and package:dep("pcre2"):exists() and not package:dep("pcre2"):config("shared") then
+            io.replace("cmake/FindPCRE2.cmake", "NAMES pcre2-8", "NAMES pcre2-8-static pcre2-8", {plain = true})
+            io.replace("cmake/FindPCRE2.cmake", "IMPORTED_LOCATION \"${PCRE2_LIBRARY}\"", "IMPORTED_LOCATION \"${PCRE2_LIBRARY}\"\nINTERFACE_COMPILE_DEFINITIONS PCRE2_STATIC", {plain = true})
+        end
         local configs = {"-DPOCO_UNBUNDLED=ON", "-DENABLE_TESTS=OFF", "-DENABLE_PDF=ON"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))

+ 1 - 0
packages/p/pybind11/xmake.lua

@@ -13,6 +13,7 @@ package("pybind11")
     add_versions("v2.8.1", "90907e50b76c8e04f1b99e751958d18e72c4cffa750474b5395a93042035e4a3")
     add_versions("v2.9.1", "ef9e63be55b3b29b4447ead511a7a898fdf36847f21cec27a13df0db051ed96b")
     add_versions("v2.9.2", "d1646e6f70d8a3acb2ddd85ce1ed543b5dd579c68b8fb8e9638282af20edead8")
+    add_versions("v2.10.0", "225df6e6dea7cea7c5754d4ed954e9ca7c43947b849b3795f87cb56437f1bd19")
 
     add_deps("cmake", "python 3.x")
     on_install("windows", "macosx", "linux", function (package)