From f91d048a3983603d53fc24616f69dacd396979c1 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 24 Oct 2024 19:50:02 -0700 Subject: [PATCH] thrift: fixed build on Amazon Linux 2 --- ...Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch b/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch index 03cf515a..da4b5e2b 100644 --- a/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch +++ b/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch @@ -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 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 - #include -+#include - - #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 @@ @@ -33,5 +20,5 @@ index f72d8f6bf..f8d23bf11 100644 #include #include -- -2.39.3 (Apple Git-145) +2.46.1