From 05ac0f6837e262eacf9da8b75084f534f9b2c781 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 27 Feb 2024 16:41:40 +0800 Subject: [PATCH 1/2] add array header file --- ports/gloo/fix-array.patch | 24 ++++++++++++++++++++++++ ports/gloo/portfile.cmake | 2 ++ ports/gloo/vcpkg.json | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/gloo/fix-array.patch diff --git a/ports/gloo/fix-array.patch b/ports/gloo/fix-array.patch new file mode 100644 index 00000000000000..2963d0452cfcc3 --- /dev/null +++ b/ports/gloo/fix-array.patch @@ -0,0 +1,24 @@ +diff --git a/gloo/transport/tcp/device.cc b/gloo/transport/tcp/device.cc +index cda44c8..2df6167 100644 +--- a/gloo/transport/tcp/device.cc ++++ b/gloo/transport/tcp/device.cc +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "gloo/common/linux.h" + #include "gloo/common/logging.h" +diff --git a/gloo/transport/tcp/tls/pair.cc b/gloo/transport/tcp/tls/pair.cc +index e8f95f7..b0277aa 100644 +--- a/gloo/transport/tcp/tls/pair.cc ++++ b/gloo/transport/tcp/tls/pair.cc +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + namespace gloo { + namespace transport { diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake index e9ed2af43f2da6..8f87e7e0f3eddc 100644 --- a/ports/gloo/portfile.cmake +++ b/ports/gloo/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1da21174054eaabbbd189b7f657ea24842d821e2 SHA512 ebd8369e413aee739a3928f8e6738c15708f009e0cd5a3763b8cadbe6f6d0a9d758585a7a2b0f7dd6d39a12882ff2f9497ab2d4edcebd4eb2a7237ab857f317e HEAD_REF master + PATCHES + fix-array.patch #https://github.com/facebookincubator/gloo/issues/332 ) # Determine which backend to build via specified feature diff --git a/ports/gloo/vcpkg.json b/ports/gloo/vcpkg.json index 7ded7731d02f81..60740196445c39 100644 --- a/ports/gloo/vcpkg.json +++ b/ports/gloo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gloo", "version": "20201203", - "port-version": 2, + "port-version": 3, "description": "Collective communications library with various primitives for multi-machine training.", "homepage": "https://github.com/facebookincubator/gloo", "supports": "x64 & linux", From bcfc9907cd580b4c66e47c303014ae643aef510b Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Tue, 27 Feb 2024 16:42:15 +0800 Subject: [PATCH 2/2] update version --- versions/baseline.json | 2 +- versions/g-/gloo.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index cd37af25bf1b3f..86b6dcd599c9bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3058,7 +3058,7 @@ }, "gloo": { "baseline": "20201203", - "port-version": 2 + "port-version": 3 }, "glpk": { "baseline": "5.0", diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json index e3983a9d935c5d..ad9fc46be03130 100644 --- a/versions/g-/gloo.json +++ b/versions/g-/gloo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc506cd5c27f23c9b2f3fb1d3cfe5774c05e0364", + "version": "20201203", + "port-version": 3 + }, { "git-tree": "a48ea12e9618f830268147a2c05fc65769182f0d", "version": "20201203",