From bb3d8bef7041a93b190cecb439b7509d5ac81a29 Mon Sep 17 00:00:00 2001 From: Ankur Tyagi Date: Tue, 5 May 2026 10:54:29 +1200 Subject: [PATCH] thrift: upgrade 0.22.0 -> 0.23.0 License-Update: add attribution section for the third-party public-domain code[1] Dropped patch which is now merged in the upstream version. Changelog: https://thrift.apache.org/changelog [1]https://github.com/apache/thrift/commit/1e5fa4b9b35ad6bfeb238d19897ace7826eda057 Signed-off-by: Ankur Tyagi Signed-off-by: Khem Raj --- .../0001-support-reproducible-builds.patch | 49 ------------------- .../{thrift_0.22.0.bb => thrift_0.23.0.bb} | 5 +- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/thrift/thrift/0001-support-reproducible-builds.patch rename meta-oe/recipes-connectivity/thrift/{thrift_0.22.0.bb => thrift_0.23.0.bb} (91%) diff --git a/meta-oe/recipes-connectivity/thrift/thrift/0001-support-reproducible-builds.patch b/meta-oe/recipes-connectivity/thrift/thrift/0001-support-reproducible-builds.patch deleted file mode 100644 index 7fad4ddaa6..0000000000 --- a/meta-oe/recipes-connectivity/thrift/thrift/0001-support-reproducible-builds.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d4c19c3c88200c49d48c9d47971977627f98f51b Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 20 Nov 2025 11:43:45 +0800 -Subject: [PATCH] support reproducible builds - -In order to support reproducible builds [1], while using bison to generate -source code, add COMPILE_FLAGS --file-prefix-map [2] to remove build path -prefix and source path prefix in the generated header file. - -[1] https://reproducible-builds.org/ -[2] https://cgit.git.savannah.gnu.org/cgit/bison.git/commit/?id=dd878d18519689c7bbcd72de4c9f9e53085a3cbf - -Upstream-Status: Submitted [https://github.com/apache/thrift/pull/3246] - -Signed-off-by: Hongxu Jia ---- - compiler/cpp/CMakeLists.txt | 2 +- - compiler/cpp/tests/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt -index 4c1c2c5..a1a8fcb 100644 ---- a/compiler/cpp/CMakeLists.txt -+++ b/compiler/cpp/CMakeLists.txt -@@ -30,7 +30,7 @@ find_package(BISON REQUIRED) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/) - - # Create flex and bison files and build the lib parse static library --BISON_TARGET(thrifty ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc) -+BISON_TARGET(thrifty ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc COMPILE_FLAGS "--file-prefix-map=${CMAKE_BINARY_DIR}='' --file-prefix-map=${CMAKE_SOURCE_DIR}=''") - FLEX_TARGET(thriftl ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thriftl.ll ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc) - ADD_FLEX_BISON_DEPENDENCY(thriftl thrifty) - -diff --git a/compiler/cpp/tests/CMakeLists.txt b/compiler/cpp/tests/CMakeLists.txt -index 6a078ec..39f5bb2 100644 ---- a/compiler/cpp/tests/CMakeLists.txt -+++ b/compiler/cpp/tests/CMakeLists.txt -@@ -45,7 +45,7 @@ find_package(BISON REQUIRED) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/) - - # Create flex and bison files and build the lib parse static library --BISON_TARGET(thrifty ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc) -+BISON_TARGET(thrifty ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc COMPILE_FLAGS "--file-prefix-map=${CMAKE_BINARY_DIR}='' --file-prefix-map=${CMAKE_SOURCE_DIR}=''") - FLEX_TARGET(thriftl ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/thriftl.ll ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc) - ADD_FLEX_BISON_DEPENDENCY(thriftl thrifty) - --- -2.34.1 - diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb b/meta-oe/recipes-connectivity/thrift/thrift_0.23.0.bb similarity index 91% rename from meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb rename to meta-oe/recipes-connectivity/thrift/thrift_0.23.0.bb index 8ca1d0085e..4f90628b4a 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb +++ b/meta-oe/recipes-connectivity/thrift/thrift_0.23.0.bb @@ -3,16 +3,15 @@ DESCRIPTION = "A software framework, for scalable cross-language services devel HOMEPAGE = "https://thrift.apache.org/" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c40a383cb3f747e0c7abbf1482f194f0 \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=bdfca4cb0874071cc3e42d2ae3b05a77 \ file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" 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://0001-support-reproducible-builds.patch \ " -SRC_URI[sha256sum] = "794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5" +SRC_URI[sha256sum] = "1859d932d2ae1f13d16c5a196931208c116310a5ff50f2bfd11d3db03be8f46f" BBCLASSEXTEND = "native nativesdk"