Browse Source

update folly related to 06.17 (#4439)

* update folly related to 06.17

* Add files via upload

* Update xmake.lua

* Delete packages/m/mvfst/shared.patch

* patch
c8ef 1 năm trước cách đây
mục cha
commit
23c0190495

+ 1 - 3
.github/workflows/fedora.yml

@@ -41,6 +41,4 @@ jobs:
         env:
           XMAKE_ROOT: y
         run: |
-          xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -j1
-
-
+          xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -j4

+ 1 - 0
packages/f/fbthrift/xmake.lua

@@ -11,6 +11,7 @@ package("fbthrift")
     add_versions("2024.03.25", "2a325446cd3a149a892c0c6abcb0f6f6cf83b72266d83ad279d2fdd9340aeef2")
     add_versions("2024.04.01", "e408a973a59a37def97a8e0ec368ee9fa39c8d49c925ecf7335f1c0463c1a819")
     add_versions("2024.06.10", "a71481f9621891a5094d93a7c49d630ae544a1f056a93811742df6469b95bf64")
+    add_versions("2024.06.17", "bfacfe477c1152df43a1681c31801f337ef7f67bc85507e09340abdd146cca7f")
 
     add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "zstd", "python")
 

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

@@ -12,6 +12,7 @@ package("fizz")
     add_versions("2024.03.25", "bcf9c551719bc86318a77e2b13769d52679642b98728e645900485d7a90c0f8b")
     add_versions("2024.04.01", "caf2cf1ba8f6db66abbadf382fb3e0667888567c4ac0d8f74ec92e1fb27c3727")
     add_versions("2024.06.10", "dabc77e2238383fb37c19327af8ab864ba030d32e98f49b23008075a7afb6e19")
+    add_versions("2024.06.17", "46e9d1b782a51b2c063390dc1161f26f2c77ef7a94ff8ccc4bdc272697cad8bb")
 
     add_deps("cmake", "folly", "libsodium", "liboqs")
 

+ 1 - 0
packages/f/folly/xmake.lua

@@ -20,6 +20,7 @@ package("folly")
     add_versions("2024.03.25", "3c57b0d1f1266e935aef1ed54535561fd2eeedc1aa946fbc46871e839014f74c")
     add_versions("2024.04.01", "f09e522c76a5f102c40c54726f6f255b0dc127c78f9c8c9ac117fc0f7ac284bb")
     add_versions("2024.06.10", "27d7f825a9a3469b59a4f0a5ba2edac733407ea8dcc036e7ca9279d803ece1e9")
+    add_versions("2024.06.17", "a26cda1cf5f9914f2ff05b5f8e4062d73f5a1ff71ee1911e734dc758313f6d30")
 
     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")

+ 20 - 0
packages/m/mvfst/patches/shared.patch

@@ -0,0 +1,20 @@
+diff --git a/quic/state/CMakeLists.txt b/quic/state/CMakeLists.txt
+index e3b0d5d9d..d86f50ee7 100644
+--- a/quic/state/CMakeLists.txt
++++ b/quic/state/CMakeLists.txt
+@@ -151,6 +151,7 @@ add_dependencies(
+   mvfst_codec
+   mvfst_codec_types
+   mvfst_state_machine
++  mvfst_flowcontrol
+ )
+ 
+ target_link_libraries(
+@@ -160,6 +161,7 @@ target_link_libraries(
+   mvfst_codec
+   mvfst_codec_types
+   mvfst_state_machine
++  mvfst_flowcontrol
+ )
+ 
+ 

+ 3 - 0
packages/m/mvfst/xmake.lua

@@ -11,6 +11,9 @@ package("mvfst")
     add_versions("2024.03.25", "293046511fb9395bdb09860f4c4202bcb848fed4cdd419d436506a07eeac66cd")
     add_versions("2024.04.01", "e39c4d7dd87520fcce6a3d5d398b5d03bd3e680186b9b0db23f02b502c6bcb1e")
     add_versions("2024.06.10", "cc75889429a66463cc8e607ba09d584fb4e6d2e69b1127a538043b367c54a1ae")
+    add_versions("2024.06.17", "748c744dae967a0ac25c89a6c7ccf62da2a4974ab45644d395fb7bc8f2e96dc1")
+
+    add_patches("2024.06.17", path.join(os.scriptdir(), "patches", "shared.patch"), "6b940f5a07e476d1f13b7d427923573333c82eb3b887d25927b6da9b0400c107")
 
     add_deps("cmake", "folly", "fizz")
 

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

@@ -11,6 +11,7 @@ package("proxygen")
     add_versions("2024.03.25", "b11c8da4dbcbbdde8d9504f2edd3eb537bdf959eccc07a8333d1936965437abc")
     add_versions("2024.04.01", "75b040c235fee853e8db90075620f56ee4aa69345eea9ab4f80aa35501fe2eff")
     add_versions("2024.06.10", "8e511c5f1e4fda9db9edab980d6b02ebb47faf086078aab85db875e339e0bff4")
+    add_versions("2024.06.17", "ab45c56c705d4c47595f3118cbaa2641be2bcd26c4d3b43e49e0c743a7272089")
 
     add_deps("cmake", "folly", "fizz", "wangle", "mvfst", "gperf", "python")
 

+ 1 - 0
packages/w/wangle/xmake.lua

@@ -12,6 +12,7 @@ package("wangle")
     add_versions("2024.03.25", "3de926ff92e59f5185e89e5e9365925530e5e57fd70f8e5107938149ce2fe140")
     add_versions("2024.04.01", "c21c3616d3017bc7b72f6b2315f81be4fd9be4c0dc6e1fae0266ec545fbc5535")
     add_versions("2024.06.10", "0328a481258a399a70ee2d003be8d482529b2f26e79ea2c218a32361051ea5be")
+    add_versions("2024.06.17", "9d3e2349be6f8462243beebc1245f8d82808734060d9e3d9c0cf45bbda3c1f70")
 
     add_deps("cmake", "folly", "fizz")