From 6539cc8b4dc322fb6082fbdb675723c480682b8a Mon Sep 17 00:00:00 2001 From: c8ef Date: Thu, 18 Jul 2024 11:04:47 +0800 Subject: [PATCH] [folly related] update to 07.15 (#4678) --- packages/f/fbthrift/xmake.lua | 1 + packages/f/fizz/xmake.lua | 1 + packages/f/folly/xmake.lua | 5 +++-- packages/m/mvfst/xmake.lua | 1 + packages/p/proxygen/xmake.lua | 1 + packages/w/wangle/xmake.lua | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/f/fbthrift/xmake.lua b/packages/f/fbthrift/xmake.lua index 2107b10a5..175085e12 100644 --- a/packages/f/fbthrift/xmake.lua +++ b/packages/f/fbthrift/xmake.lua @@ -15,6 +15,7 @@ package("fbthrift") add_versions("2024.06.24", "78bbc48d1dfa8948580b780b3e827b4562102d2b9ca87db11b5a03ba277ac0e5") add_versions("2024.07.01", "fa2302fdabf54780213cc3c5b7047226d7d9b91b8e1b9528330f1041c16b25eb") add_versions("2024.07.08", "5efada565a85057824c58784dedd2600a03e531d526021bfe8bb8b655f56f09e") + add_versions("2024.07.15", "2671ebe49d6d379cc0f43c95c08a173fd6da6f04a9f748acdcda4d7a185f27f4") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python") diff --git a/packages/f/fizz/xmake.lua b/packages/f/fizz/xmake.lua index d831ba8c8..31113c813 100644 --- a/packages/f/fizz/xmake.lua +++ b/packages/f/fizz/xmake.lua @@ -16,6 +16,7 @@ package("fizz") add_versions("2024.06.24", "b5fd5fb3fe1cf20519ea91d6a0127505596f8c74c82cde9d54ea6ae92df86a50") add_versions("2024.07.01", "002bca2765cb0889ec535eeb1950acf93af57638a2da9b2deacc522113625fcc") add_versions("2024.07.08", "dd80231fb79760ef0b15394364ddbe35d4da82a7e07238dbaaf2f98f267d3938") + add_versions("2024.07.15", "44da982621aa91f15f5b2ec7a27510aab4650383b3a135372586501f3f44fc6c") add_deps("cmake", "folly", "libsodium", "liboqs") diff --git a/packages/f/folly/xmake.lua b/packages/f/folly/xmake.lua index 69ff9cbf0..97b85e2f6 100644 --- a/packages/f/folly/xmake.lua +++ b/packages/f/folly/xmake.lua @@ -24,11 +24,12 @@ package("folly") add_versions("2024.06.24", "05ce0aed45c3a8125334438564364fbf32cd0d80b2a58c010cc821f5f16def50") add_versions("2024.07.01", "a619f2759e821d4657aa9f1cae0dedcec2085e656e16a3c458e053a759d2ce83") add_versions("2024.07.08", "93c9c7c7e3cb30c1b4437ac3043c05a245383fbb6e558abda704d61f14dc67bd") + add_versions("2024.07.15", "cbdd4400999c86d7ba271fdf3c15485ec5e250302aa98aebbca6f7e5715e6d8a") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "reorder.patch"), "9a6bf283881580474040cfc7a8e89d461d68b89bae5583d89fff0a3198739980") add_patches("<=2022.08.29", path.join(os.scriptdir(), "patches", "2021.06.28", "regex.patch"), "6a77ade9f48dd9966d3f7154e66ca8a5c030ae2b6d335cbe3315784aefd8f495") - add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") - add_patches("<=2024.07.08", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") + add_patches("<=2024.07.15", path.join(os.scriptdir(), "patches", "2023.11.20", "pkgconfig.patch"), "6838623d453418569853f62ad97c729e802a120c13d804aabba6d6455997e674") + add_patches("<=2024.07.15", path.join(os.scriptdir(), "patches", "2023.11.20", "msvc.patch"), "1ee01c75528bd42736541022af461e44af3031c01d62c9342006f0abc0f44f2d") if is_plat("windows") then add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true}) diff --git a/packages/m/mvfst/xmake.lua b/packages/m/mvfst/xmake.lua index 8ccfe7247..12d68900c 100644 --- a/packages/m/mvfst/xmake.lua +++ b/packages/m/mvfst/xmake.lua @@ -15,6 +15,7 @@ package("mvfst") add_versions("2024.06.24", "0a8c9bf9c9e1e293e56c0bd05e60606b2b299245510442a2e9af01519c040041") add_versions("2024.07.01", "833fc3421cb8a17ab1c2b5542e76074bcb9cfd534ec5e459393dd1e774921907") add_versions("2024.07.08", "345080326a3a8a24439253f7029b8f3c0785d804a179757b94ea2a5a52f4013f") + add_versions("2024.07.15", "598ac31d018c980c60d19fd5bd625b79cc6235250fdb3210524cfaa6cf27bddb") add_patches(">=2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107") diff --git a/packages/p/proxygen/xmake.lua b/packages/p/proxygen/xmake.lua index 777af3433..7585ac6a4 100644 --- a/packages/p/proxygen/xmake.lua +++ b/packages/p/proxygen/xmake.lua @@ -15,6 +15,7 @@ package("proxygen") add_versions("2024.06.24", "4087de735334ba50f1e9c8df7c2040718d3c1ba9f9da102db5bbb7328a56b94a") add_versions("2024.07.01", "eb5141c6e972b3957a15ab90feb3d56b68061b2ca8d463fe84776cce5c9629bb") add_versions("2024.07.08", "3980eceba8a353222f831a411feeeec8f4e8b846278abb915f20865765a2edbf") + add_versions("2024.07.15", "ab26ec9184980edf709547af5dd7f52030f60d2d4474b269c93a96e809c10c5f") add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python") diff --git a/packages/w/wangle/xmake.lua b/packages/w/wangle/xmake.lua index ec0484445..73795d3bc 100644 --- a/packages/w/wangle/xmake.lua +++ b/packages/w/wangle/xmake.lua @@ -16,6 +16,7 @@ package("wangle") add_versions("2024.06.24", "a4e83d477ef3c8c208f30a811772f0d551e0728f42f45bf647a82f3b82d60baf") add_versions("2024.07.01", "596dff77b6d6adef64e7b86f0f3e019c2ac787c92da0ddc18fbdaa4eca02cb3d") add_versions("2024.07.08", "b620ba5dee2f6c47c1d3002cb795524b1efe30f2689088000f010ecc0f9b03b2") + add_versions("2024.07.15", "0b48e84db224ff090ab005ae8824af56d71cc3f86d05e996cae33235e6b0ccd0") add_deps("cmake", "folly", "fizz")