From b0186b1c292702f09631ecea9789b2e939cbd93d Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:55:04 +0000
Subject: [PATCH] [gloo] Update to 20240626 (#41180)

---
 ports/gloo/fix-array.patch | 24 ------------------------
 ports/gloo/portfile.cmake  |  8 +++-----
 ports/gloo/vcpkg.json      |  3 +--
 versions/baseline.json     |  4 ++--
 versions/g-/gloo.json      |  5 +++++
 5 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 ports/gloo/fix-array.patch

diff --git a/ports/gloo/fix-array.patch b/ports/gloo/fix-array.patch
deleted file mode 100644
index 2963d0452c..0000000000
--- a/ports/gloo/fix-array.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 <netdb.h>
- #include <netinet/in.h>
- #include <string.h>
-+#include <array>
- 
- #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 <cstring>
- #include <poll.h>
-+#include <array>
- 
- namespace gloo {
- namespace transport {
diff --git a/ports/gloo/portfile.cmake b/ports/gloo/portfile.cmake
index 8f87e7e0f3..347f577ab0 100644
--- a/ports/gloo/portfile.cmake
+++ b/ports/gloo/portfile.cmake
@@ -1,12 +1,10 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO facebookincubator/gloo
-  REF 1da21174054eaabbbd189b7f657ea24842d821e2
-  SHA512 ebd8369e413aee739a3928f8e6738c15708f009e0cd5a3763b8cadbe6f6d0a9d758585a7a2b0f7dd6d39a12882ff2f9497ab2d4edcebd4eb2a7237ab857f317e
+  REF 81925d1c674c34f0dc34dd9a0f2151c1b6f701eb
+  SHA512 2783908e7e0d6bd7f8cf59f4e6a94c84908e459f394c294cdf34aa8d1943a193fb25d15a8662f5a32a82b23a2657e63b1aa562f3ad8953ef79c9f502d04fed20
   HEAD_REF master
-  PATCHES
-      fix-array.patch #https://github.com/facebookincubator/gloo/issues/332
-  )
+)
 
 # Determine which backend to build via specified feature
 vcpkg_check_features(
diff --git a/ports/gloo/vcpkg.json b/ports/gloo/vcpkg.json
index 6074019644..03a382327b 100644
--- a/ports/gloo/vcpkg.json
+++ b/ports/gloo/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gloo",
-  "version": "20201203",
-  "port-version": 3,
+  "version": "20240626",
   "description": "Collective communications library with various primitives for multi-machine training.",
   "homepage": "https://github.com/facebookincubator/gloo",
   "supports": "x64 & linux",
diff --git a/versions/baseline.json b/versions/baseline.json
index 92615902cc..7ab610241e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3153,8 +3153,8 @@
       "port-version": 0
     },
     "gloo": {
-      "baseline": "20201203",
-      "port-version": 3
+      "baseline": "20240626",
+      "port-version": 0
     },
     "glpk": {
       "baseline": "5.0",
diff --git a/versions/g-/gloo.json b/versions/g-/gloo.json
index ad9fc46be0..adb756df6b 100644
--- a/versions/g-/gloo.json
+++ b/versions/g-/gloo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ae23d02fbd7438a580058574bcbda144323a203e",
+      "version": "20240626",
+      "port-version": 0
+    },
     {
       "git-tree": "cc506cd5c27f23c9b2f3fb1d3cfe5774c05e0364",
       "version": "20201203",