ソースを参照

Folly 2022.04.25 (#1196)

* Folly 2022.04.25

update folly to 2022.04.25

* add patches for folly

add patches for folly 2022.04.25

* remove libc++ for boost

remove libc++ for boost when compiler is clang
45degree 3 年 前
コミット
aa7146b81a
2 ファイル変更3 行追加6 行削除
  1. 0 4
      packages/b/boost/xmake.lua
  2. 3 2
      packages/f/folly/xmake.lua

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

@@ -160,10 +160,6 @@ package("boost")
             table.insert(argv, "cxxflags=-std:c++14")
         else
             table.insert(argv, "cxxflags=-std=c++14")
-            if package:build_getenv("cxx"):find("clang", 1, true) then
-                table.insert(argv, "cxxflags=-stdlib=libc++")
-                table.insert(argv, "linkflags=-stdlib=libc++")
-            end
             if package:config("pic") ~= false then
                 table.insert(argv, "cxxflags=-fPIC")
             end

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

@@ -10,9 +10,10 @@ package("folly")
     add_versions("2021.08.02", "03159657ef7a08c1207d90e63f02d4d6b1241dcae49f11a72441c0c269b269fa")
     add_versions("2021.11.01", "2620ad559f1e041f50328c91838cde666d422ed09f23b31bcdbf61e709da5c17")
     add_versions("2022.02.14", "6a50d4cc954f0f77efc85af231ee6b7f676a0d743c12b7080fb03fd3da3ffbf2")
+    add_versions("2022.04.25", "7d5cd59613780d7d2b9c946c810bfd6b0d11ed3a8a74c5ab00d4e9de5d1b2104")
 
-    add_patches("<=2022.02.14", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980")
-    add_patches("<=2022.02.14", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495")
+    add_patches("<=2022.04.25", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980")
+    add_patches("<=2022.04.25", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})