Skip to content

Commit 3f25947

Browse files
authored
Updated Gloo to version as of 2021-05-21 (#5352)
* Updated Gloo to version as of 2021-05-21 * Added musl __caddr_t patch * Updated mingw-lowercase-include.patch * Added mingw32 patch to link with ws2_32
1 parent 6df213f commit 3f25947

File tree

4 files changed

+51
-4
lines changed

4 files changed

+51
-4
lines changed

G/Gloo/build_tarballs.jl

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
using BinaryBuilder, Pkg
44

55
name = "Gloo"
6-
version = v"0.0.20200910"
6+
version = v"0.0.20210521"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/facebookincubator/gloo.git", "881f7f0dcf06f7e49e134a45d3284860fb244fa9"),
10+
GitSource("https://github.com/facebookincubator/gloo.git", "c22a5cfba94edf8ea4f53a174d38aa0c629d070f"),
1111
DirectorySource("./bundled"),
1212
]
1313

@@ -16,6 +16,8 @@ script = raw"""
1616
cd $WORKSPACE/srcdir/gloo
1717
atomic_patch -p1 ../patches/mingw32.patch
1818
atomic_patch -p1 ../patches/mingw-lowercase-include.patch
19+
atomic_patch -p1 ../patches/mingw32-link-with-ws2_32.patch
20+
atomic_patch -p1 ../patches/musl-caddr.patch
1921
mkdir build
2022
cd build
2123
if [[ $target != *w64-mingw32* ]]; then

G/Gloo/bundled/patches/mingw-lowercase-include.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/gloo/types.h b/gloo/types.h
2-
index 4635f41..847e96d 100644
2+
index cd38c8a..b8d56a8 100644
33
--- a/gloo/types.h
44
+++ b/gloo/types.h
5-
@@ -26,7 +26,7 @@
5+
@@ -30,7 +30,7 @@
66
#include "gloo/common/common.h"
77

88
#ifdef _WIN32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
2+
index 2e200e6..a7c5e00 100644
3+
--- a/cmake/Dependencies.cmake
4+
+++ b/cmake/Dependencies.cmake
5+
@@ -5,6 +5,10 @@ set(gloo_hip_DEPENDENCY_LIBS "")
6+
# Configure path to modules (for find_package)
7+
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
8+
9+
+if (WIN32)
10+
+ list(APPEND gloo_DEPENDENCY_LIBS "ws2_32")
11+
+endif()
12+
+
13+
if(USE_REDIS)
14+
find_package(hiredis REQUIRED)
15+
if(HIREDIS_FOUND)
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --git a/gloo/common/linux.cc b/gloo/common/linux.cc
2+
index 020ff09..9709e5c 100644
3+
--- a/gloo/common/linux.cc
4+
+++ b/gloo/common/linux.cc
5+
@@ -20,6 +20,7 @@
6+
#include <string.h>
7+
#include <sys/ioctl.h>
8+
#include <sys/socket.h>
9+
+#include <sys/types.h>
10+
#include <unistd.h>
11+
12+
#include <algorithm>
13+
@@ -193,7 +194,7 @@ static int getInterfaceSpeedGLinkSettings(int sock, struct ifreq* ifr) {
14+
} ecmd;
15+
int rv;
16+
17+
- ifr->ifr_data = (__caddr_t)&ecmd;
18+
+ ifr->ifr_data = (caddr_t)&ecmd;
19+
memset(&ecmd, 0, sizeof(ecmd));
20+
ecmd.req.cmd = ETHTOOL_GLINKSETTINGS;
21+
22+
@@ -221,7 +222,7 @@ static int getInterfaceSpeedGSet(int sock, struct ifreq* ifr) {
23+
struct ethtool_cmd edata;
24+
int rv;
25+
26+
- ifr->ifr_data = (__caddr_t)&edata;
27+
+ ifr->ifr_data = (caddr_t)&edata;
28+
memset(&edata, 0, sizeof(edata));
29+
edata.cmd = ETHTOOL_GSET;
30+

0 commit comments

Comments
 (0)