Skip to content

Commit

Permalink
Merge pull request #8 from opencomputeproject/mitigate-compiler-issues
Browse files Browse the repository at this point in the history
Add patches that mitigate compiler bugs and missing includes for some compiler versions
  • Loading branch information
Goshik92 authored Apr 11, 2024
2 parents 065fc13 + 7988575 commit 7f38c4d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
15 changes: 15 additions & 0 deletions external/abseil_patch.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
https://github.com/abseil/abseil-cpp/commit/2039d5dff0cef8fe3841519f0418caef6ec47d2d
diff --git a/absl/strings/internal/damerau_levenshtein_distance.h b/absl/strings/internal/damerau_levenshtein_distance.h
index 1a9684254aa..7a4bd644626 100644
--- a/absl/strings/internal/damerau_levenshtein_distance.h
+++ b/absl/strings/internal/damerau_levenshtein_distance.h
@@ -15,8 +15,7 @@
#ifndef ABSL_STRINGS_INTERNAL_DAMERAU_LEVENSHTEIN_DISTANCE_H_
#define ABSL_STRINGS_INTERNAL_DAMERAU_LEVENSHTEIN_DISTANCE_H_

-#include <numeric>
-#include <vector>
+#include <cstdint>

#include "absl/strings/string_view.h"

14 changes: 14 additions & 0 deletions external/grpc_patch.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
https://github.com/grpc/grpc/pull/31780/commits/18f065b4509e457ca102874830852ecd88b1e177
diff --git a/src/core/ext/xds/xds_listener.h b/src/core/ext/xds/xds_listener.h
index 61427483f1888..a3bfed0780cc3 100644
--- a/src/core/ext/xds/xds_listener.h
+++ b/src/core/ext/xds/xds_listener.h
@@ -79,6 +79,8 @@ struct XdsListenerResource : public XdsResourceType::ResourceData {
};

struct DownstreamTlsContext {
+ DownstreamTlsContext() {}
+
CommonTlsContext common_tls_context;
bool require_client_certificate = false;

4 changes: 4 additions & 0 deletions ocpdiag/build_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def load_deps(ocpdiag_package_name = "ocpdiag"):
url = "https://github.com/abseil/abseil-cpp/archive/64f00b1f4a064e9e140fc4642ccd55c9c2e2e365.zip", # 2022-11-08
strip_prefix = "abseil-cpp-64f00b1f4a064e9e140fc4642ccd55c9c2e2e365",
sha256 = "e7c605119f5aefdf3cd0159f2cbc439c2f7d614c99758be32e0258d49201fc4e",
patches = ["abseil_patch.diff"],
patch_args = ["-p1"],
)

maybe(
Expand Down Expand Up @@ -101,6 +103,8 @@ def load_deps(ocpdiag_package_name = "ocpdiag"):
"com_github_grpc_grpc",
url = "https://github.com/grpc/grpc/archive/refs/tags/v1.51.3.tar.gz",
strip_prefix = "grpc-1.51.3",
patch_args = ["-p1"],
patches = ["grpc_patch.diff"],
sha256 = "feaeeb315133ea5e3b046c2c0231f5b86ef9d297e536a14b73e0393335f8b157",
)

Expand Down

0 comments on commit 7f38c4d

Please sign in to comment.