From 0f9f2ecabc72168ce078422671fa791d230b6270 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 10 Jun 2025 11:33:27 +0800 Subject: [PATCH] thrift: upgrade 0.21.0 -> 0.22.0 0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch removed since it's included in 0.22.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-missing-cstdint-include-for-int64_t.patch | 52 ------------------- .../{thrift_0.21.0.bb => thrift_0.22.0.bb} | 3 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/thrift/thrift/0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch rename meta-oe/recipes-connectivity/thrift/{thrift_0.21.0.bb => thrift_0.22.0.bb} (93%) diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch b/meta-oe/recipes-connectivity/thrift/thrift/0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch deleted file mode 100644 index e0bce16537..0000000000 --- a/meta-oe/recipes-connectivity/thrift/thrift/0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 947ad66940cfbadd9b24ba31d892dfc1142dd330 Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei -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 ` 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 ''; this is probably fixable by adding '#include ' - 24 | #include - +++ |+#include - 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 ''; this is probably fixable by adding '#include ' - -See also: https://github.com/apache/arrow/issues/45096 - -Upstream-Status: Backport [https://github.com/apache/thrift/commit/947ad66940cfbadd9b24ba31d892dfc1142dd330] ---- - 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 - #include - #include - --- -2.34.1 - diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.21.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb similarity index 93% rename from meta-oe/recipes-connectivity/thrift/thrift_0.21.0.bb rename to meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb index 85e2e68694..9c50317eff 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.21.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb @@ -10,9 +10,8 @@ DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ - file://0002-THRIFT-5842-Add-missing-cstdint-include-for-int64_t.patch \ " -SRC_URI[sha256sum] = "9a24f3eba9a4ca493602226c16d8c228037db3b9291c6fc4019bfe3bd39fc67c" +SRC_URI[sha256sum] = "794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5" BBCLASSEXTEND = "native nativesdk"