فهرست منبع

Update proxygen to 06.10 (#4378)

* Update proxygen to 06.10

* Update xmake.lua

* Update xmake.lua

* migrate config
c8ef 1 سال پیش
والد
کامیت
a815ba4933
2فایلهای تغییر یافته به همراه23 افزوده شده و 4 حذف شده
  1. 14 3
      packages/f/folly/xmake.lua
  2. 9 1
      packages/p/proxygen/xmake.lua

+ 14 - 3
packages/f/folly/xmake.lua

@@ -30,6 +30,10 @@ package("folly")
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
     end
 
+    add_configs("lzma", {description = "Support LZMA for compression", default = true, type = "boolean"})
+    add_configs("libaio", {description = "Support compile with libaio", default = true, type = "boolean"})
+    add_configs("liburing", {description = "Support compile with liburing", default = true, type = "boolean"})
+
     add_deps("cmake")
     add_deps("boost", {configs = {date_time = true, iostreams = true, context = true, filesystem = true, program_options = true, regex = true, system = true, thread = true}})
     add_deps("libevent", {configs = {openssl = true}})
@@ -42,9 +46,16 @@ package("folly")
         add_syslinks("c++abi")
     end
 
-    on_load("linux", function (package)
-        package:add("deps", "libaio")
-        package:add("deps", "liburing")
+    on_load(function (package)
+        if package:config("lzma") then
+            package:add("deps", "xz")
+        end
+        if package:is_plat("linux") and package:config("libaio") then
+            package:add("deps", "libaio")
+        end
+        if package:is_plat("linux") and package:config("liburing") then
+            package:add("deps", "liburing")
+        end
     end)
 
     on_install("linux", "macosx", function (package)

+ 9 - 1
packages/p/proxygen/xmake.lua

@@ -10,6 +10,7 @@ package("proxygen")
     add_versions("2024.03.18", "7731c5eea71f1ab3182a1a54329abae983ac63794f86768762a0136587dfd979")
     add_versions("2024.03.25", "b11c8da4dbcbbdde8d9504f2edd3eb537bdf959eccc07a8333d1936965437abc")
     add_versions("2024.04.01", "75b040c235fee853e8db90075620f56ee4aa69345eea9ab4f80aa35501fe2eff")
+    add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4")
 
     add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python")
 
@@ -23,5 +24,12 @@ package("proxygen")
     end)
 
     on_test(function (package)
-        assert(package:has_cxxincludes("proxygen/httpserver/ScopedHTTPServer.h", {configs = {languages = "c++17"}}))
+        assert(package:check_cxxsnippets({test = [[
+            #include "proxygen/httpserver/HTTPServer.h"
+            void test() {
+                proxygen::HTTPServerOptions options;
+                options.threads = 4;
+                proxygen::HTTPServer server(std::move(options));
+            }
+        ]]}, {configs = {languages = "c++17"}}))
     end)