diff options
| author | Ankur Tyagi <ankur.tyagi85@gmail.com> | 2026-05-05 10:54:29 +1200 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-05-07 10:45:52 -0700 |
| commit | bb3d8bef7041a93b190cecb439b7509d5ac81a29 (patch) | |
| tree | 9c68f89d844195daee015d141d182ebefc84acc3 | |
| parent | 135252972014f240b34baec4b25c71e37fbbcf12 (diff) | |
| download | meta-openembedded-bb3d8bef7041a93b190cecb439b7509d5ac81a29.tar.gz | |
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 <ankur.tyagi85@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift/0001-support-reproducible-builds.patch | 49 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift_0.23.0.bb (renamed from meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb) | 5 |
2 files changed, 2 insertions, 52 deletions
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 @@ | |||
| 1 | From d4c19c3c88200c49d48c9d47971977627f98f51b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Thu, 20 Nov 2025 11:43:45 +0800 | ||
| 4 | Subject: [PATCH] support reproducible builds | ||
| 5 | |||
| 6 | In order to support reproducible builds [1], while using bison to generate | ||
| 7 | source code, add COMPILE_FLAGS --file-prefix-map [2] to remove build path | ||
| 8 | prefix and source path prefix in the generated header file. | ||
| 9 | |||
| 10 | [1] https://reproducible-builds.org/ | ||
| 11 | [2] https://cgit.git.savannah.gnu.org/cgit/bison.git/commit/?id=dd878d18519689c7bbcd72de4c9f9e53085a3cbf | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://github.com/apache/thrift/pull/3246] | ||
| 14 | |||
| 15 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 16 | --- | ||
| 17 | compiler/cpp/CMakeLists.txt | 2 +- | ||
| 18 | compiler/cpp/tests/CMakeLists.txt | 2 +- | ||
| 19 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt | ||
| 22 | index 4c1c2c5..a1a8fcb 100644 | ||
| 23 | --- a/compiler/cpp/CMakeLists.txt | ||
| 24 | +++ b/compiler/cpp/CMakeLists.txt | ||
| 25 | @@ -30,7 +30,7 @@ find_package(BISON REQUIRED) | ||
| 26 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/) | ||
| 27 | |||
| 28 | # Create flex and bison files and build the lib parse static library | ||
| 29 | -BISON_TARGET(thrifty ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc) | ||
| 30 | +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}=''") | ||
| 31 | FLEX_TARGET(thriftl ${CMAKE_CURRENT_SOURCE_DIR}/src/thrift/thriftl.ll ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc) | ||
| 32 | ADD_FLEX_BISON_DEPENDENCY(thriftl thrifty) | ||
| 33 | |||
| 34 | diff --git a/compiler/cpp/tests/CMakeLists.txt b/compiler/cpp/tests/CMakeLists.txt | ||
| 35 | index 6a078ec..39f5bb2 100644 | ||
| 36 | --- a/compiler/cpp/tests/CMakeLists.txt | ||
| 37 | +++ b/compiler/cpp/tests/CMakeLists.txt | ||
| 38 | @@ -45,7 +45,7 @@ find_package(BISON REQUIRED) | ||
| 39 | file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/) | ||
| 40 | |||
| 41 | # Create flex and bison files and build the lib parse static library | ||
| 42 | -BISON_TARGET(thrifty ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/thrifty.yy ${CMAKE_CURRENT_BINARY_DIR}/thrift/thrifty.cc) | ||
| 43 | +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}=''") | ||
| 44 | FLEX_TARGET(thriftl ${THRIFT_COMPILER_SOURCE_DIR}/src/thrift/thriftl.ll ${CMAKE_CURRENT_BINARY_DIR}/thrift/thriftl.cc) | ||
| 45 | ADD_FLEX_BISON_DEPENDENCY(thriftl thrifty) | ||
| 46 | |||
| 47 | -- | ||
| 48 | 2.34.1 | ||
| 49 | |||
diff --git a/meta-oe/recipes-connectivity/thrift/thrift_0.22.0.bb b/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 | |||
| 3 | HOMEPAGE = "https://thrift.apache.org/" | 3 | HOMEPAGE = "https://thrift.apache.org/" |
| 4 | 4 | ||
| 5 | LICENSE = "Apache-2.0" | 5 | LICENSE = "Apache-2.0" |
| 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c40a383cb3f747e0c7abbf1482f194f0 \ | 6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bdfca4cb0874071cc3e42d2ae3b05a77 \ |
| 7 | file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" | 7 | file://NOTICE;md5=2659b43daca219f99a2f2626ea128f73" |
| 8 | 8 | ||
| 9 | DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" | 9 | DEPENDS = "thrift-native boost flex-native bison-native openssl zlib" |
| 10 | 10 | ||
| 11 | SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ | 11 | SRC_URI = "https://downloads.apache.org/${BPN}/${PV}/${BP}.tar.gz \ |
| 12 | file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ | 12 | file://0001-DefineInstallationPaths.cmake-Define-libdir-in-terms.patch \ |
| 13 | file://0001-support-reproducible-builds.patch \ | ||
| 14 | " | 13 | " |
| 15 | SRC_URI[sha256sum] = "794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5" | 14 | SRC_URI[sha256sum] = "1859d932d2ae1f13d16c5a196931208c116310a5ff50f2bfd11d3db03be8f46f" |
| 16 | 15 | ||
| 17 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
| 18 | 17 | ||
