2
0
Эх сурвалжийг харах

add fizz & enable folly on macos arm (#3396)

* try add fizz

* try add fizz

* update hash

* try path

* try path

* update

* update

* update

* upd

* upd

* last resort

* wip

* hopefully
c8ef 1 жил өмнө
parent
commit
47c43431ce

+ 1 - 1
.github/workflows/ubuntu_clang.yml

@@ -33,4 +33,4 @@ jobs:
 
 
       - name: Tests
       - name: Tests
         run: |
         run: |
-          xmake l ./scripts/test.lua -vD --toolchain=clang -k ${{ matrix.kind }}
+          xmake l ./scripts/test.lua -vD --toolchain=clang-15 -k ${{ matrix.kind }}

+ 24 - 0
packages/f/fizz/xmake.lua

@@ -0,0 +1,24 @@
+package("fizz")
+    set_homepage("https://github.com/facebookincubator/fizz")
+    set_description("C++14 implementation of the TLS-1.3 standard ")
+    set_license("BSD")
+
+    add_urls("https://github.com/facebookincubator/fizz/releases/download/v$(version).00/fizz-v$(version).00.zip",
+             "https://github.com/facebookincubator/fizz.git")
+    add_versions("2024.02.26", "fa389dca0c49e14e83e089f07f896bf616757b3c70723ddfac7be2e3fd1f312f")
+
+    add_deps("cmake", "folly", "libsodium")
+
+    on_install("linux", "macosx", function (package)
+        os.cd("fizz")
+        local configs = {"-DBUILD_TESTS=OFF",
+                         "-DBUILD_EXAMPLES=OFF",
+                         "-DCMAKE_CXX_STANDARD=17"}
+        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"))
+        import("package.tools.cmake").install(package, configs)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cxxincludes("fizz/server/AsyncFizzServer.h", {configs = {languages = "c++17"}}))
+    end)

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

@@ -33,7 +33,7 @@ package("folly")
         add_syslinks("pthread")
         add_syslinks("pthread")
     end
     end
 
 
-    on_install("windows|x64", "linux", "macosx|x86_64", function (package)
+    on_install("windows|x64", "linux", "macosx", function (package)
         local configs = {"-DBUILD_TESTS=OFF",
         local configs = {"-DBUILD_TESTS=OFF",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON",
@@ -41,7 +41,8 @@ package("folly")
                          "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON",
                          "-DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON",
                          "-DLIBAIO_FOUND=OFF",
                          "-DLIBAIO_FOUND=OFF",
                          "-DLIBURCU_FOUND=OFF",
                          "-DLIBURCU_FOUND=OFF",
-                         "-DBOOST_LINK_STATIC=ON"}
+                         "-DBOOST_LINK_STATIC=ON",
+                         "-DCMAKE_CXX_STANDARD=17"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         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"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:is_plat("windows") then
         if package:is_plat("windows") then