Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gloo] Add array header file #36988

Merged
merged 2 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions ports/gloo/fix-array.patch
Original file line number Diff line number Diff line change
@@ -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 <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 {
2 changes: 2 additions & 0 deletions ports/gloo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/gloo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3058,7 +3058,7 @@
},
"gloo": {
"baseline": "20201203",
"port-version": 2
"port-version": 3
},
"glpk": {
"baseline": "5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gloo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cc506cd5c27f23c9b2f3fb1d3cfe5774c05e0364",
"version": "20201203",
"port-version": 3
},
{
"git-tree": "a48ea12e9618f830268147a2c05fc65769182f0d",
"version": "20201203",
Expand Down
Loading