mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
thrift: fix build with gcc 15
Cherry-pick a patch adding missing cstdint include for int64_t in Mutex.h Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
committed by
Anuj Mittal
parent
92b5724cef
commit
1dfa9a4db6
+51
@@ -0,0 +1,51 @@
|
||||
From 949cf4dc8973b39138cf89ce817b714d3bcce6eb Mon Sep 17 00:00:00 2001
|
||||
From: Sutou Kouhei <kou@clear-code.com>
|
||||
Date: Mon, 23 Dec 2024 12:33:22 +0900
|
||||
Subject: [PATCH] THRIFT-5842: Add missing cstdint include for int64_t in
|
||||
Mutex.h
|
||||
|
||||
Client: cpp
|
||||
|
||||
GCC 15 (not released yet) requires `#include <cstdint>` for `int64_t`
|
||||
but `lib/cpp/src/thrift/concurrency/Mutex.h` doesn't have it. So we
|
||||
can't build Thrift with GCC 15:
|
||||
|
||||
[80/359] Building CXX object lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o
|
||||
FAILED: lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o
|
||||
/bin/g++-15 -DBOOST_ALL_DYN_LINK -DBOOST_TEST_DYN_LINK -DTHRIFT_STATIC_DEFINE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/kou/work/cpp/thrift.kou.build/lib/cpp -I/home/kou/work/cpp/thrift.kou/lib/cpp -I/home/kou/work/cpp/thrift.kou.build -I/home/kou/work/cpp/thrift.kou/lib/cpp/src -g -std=c++11 -MD -MT lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o -MF lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o.d -o lib/cpp/CMakeFiles/thrift.dir/src/thrift/transport/TSSLServerSocket.cpp.o -c /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp
|
||||
In file included from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TServerSocket.h:25,
|
||||
from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.h:23,
|
||||
from /home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp:21:
|
||||
/home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:47:26: error: 'int64_t' has not been declared
|
||||
47 | virtual bool timedlock(int64_t milliseconds) const;
|
||||
| ^~~~~~~
|
||||
/home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:25:1: note: 'int64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
|
||||
24 | #include <thrift/TNonCopyable.h>
|
||||
+++ |+#include <cstdint>
|
||||
25 |
|
||||
/home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:60:29: error: 'int64_t' has not been declared
|
||||
60 | Guard(const Mutex& value, int64_t timeout = 0) : mutex_(&value) {
|
||||
| ^~~~~~~
|
||||
/home/kou/work/cpp/thrift.kou/lib/cpp/src/thrift/concurrency/Mutex.h:60:29: note: 'int64_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
|
||||
|
||||
See also: https://github.com/apache/arrow/issues/45096
|
||||
|
||||
Upstream-Status: Backport [https://github.com/apache/thrift/pull/3078]
|
||||
|
||||
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
|
||||
---
|
||||
lib/cpp/src/thrift/concurrency/Mutex.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/cpp/src/thrift/concurrency/Mutex.h b/lib/cpp/src/thrift/concurrency/Mutex.h
|
||||
index 1e5c3fba3..12f1729d6 100644
|
||||
--- a/lib/cpp/src/thrift/concurrency/Mutex.h
|
||||
+++ b/lib/cpp/src/thrift/concurrency/Mutex.h
|
||||
@@ -20,6 +20,7 @@
|
||||
#ifndef _THRIFT_CONCURRENCY_MUTEX_H_
|
||||
#define _THRIFT_CONCURRENCY_MUTEX_H_ 1
|
||||
|
||||
+#include <cstdint>
|
||||
#include <memory>
|
||||
#include <thrift/TNonCopyable.h>
|
||||
|
||||
@@ -11,7 +11,8 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib"
|
||||
SRC_URI = "https://archive.apache.org/dist/${BPN}/${PV}/${BP}.tar.gz \
|
||||
file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \
|
||||
file://0001-thrift-pr2755.patch \
|
||||
"
|
||||
file://0001-THRIFT-5842-Add-missing-cstdint-include-for-int64_t-.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "b5d8311a779470e1502c027f428a1db542f5c051c8e1280ccd2163fa935ff2d6"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user