Skip to content

Commit

Permalink
thrift: fixed build on Amazon Linux 2
Browse files Browse the repository at this point in the history
  • Loading branch information
thresheek authored and oxpa committed Oct 25, 2024
1 parent 1dd3aab commit f91d048
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,14 @@
From 7fd0aace135c794e2a791913a4e09412208e88c3 Mon Sep 17 00:00:00 2001
From 25c75dcc1d911c3b97231e22fffa94da7bccb2bd Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Wed, 22 Nov 2023 13:46:29 -0800
Subject: [PATCH 2/2] Fixed build with GCC 4.8.5 on RHEL 7.
Subject: [PATCH] Fixed build with GCC 4.8.5 on RHEL 7.

---
lib/cpp/src/thrift/numeric_cast.h | 1 +
lib/cpp/src/thrift/transport/TBufferTransports.h | 1 +
2 files changed, 2 insertions(+)
1 file changed, 1 insertion(+)

diff --git a/lib/cpp/src/thrift/numeric_cast.h b/lib/cpp/src/thrift/numeric_cast.h
index d7063dbc6..8775121a0 100644
--- a/lib/cpp/src/thrift/numeric_cast.h
+++ b/lib/cpp/src/thrift/numeric_cast.h
@@ -22,6 +22,7 @@

#include <limits>
#include <stdexcept>
+#include <typeinfo>

#if defined(_MSC_VER)
// avoid compiler warnings and errors in MSVC if max is defined as a macro
diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h
index f72d8f6bf..f8d23bf11 100644
index 8518800a4..e74143243 100644
--- a/lib/cpp/src/thrift/transport/TBufferTransports.h
+++ b/lib/cpp/src/thrift/transport/TBufferTransports.h
@@ -23,6 +23,7 @@
Expand All @@ -33,5 +20,5 @@ index f72d8f6bf..f8d23bf11 100644
#include <thrift/transport/TTransport.h>
#include <thrift/transport/TVirtualTransport.h>
--
2.39.3 (Apple Git-145)
2.46.1

0 comments on commit f91d048

Please sign in to comment.