From 04bb919a9509ba2afe607b8efa63ba2e11b08bc9 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 12 Mar 2025 08:59:44 +0800 Subject: googlebenchmark: upgrade 1.8.4 -> 1.9.1 * Remove following two patches, alreay included in 1.9.1 0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch 0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch * Change log https://github.com/google/benchmark/releases Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- ...Fix-type-conversion-to-match-function-ret.patch | 33 ---------------------- ...Fix-type-conversion-to-match-function-ret.patch | 32 --------------------- .../googlebenchmark/googlebenchmark_1.8.4.bb | 22 --------------- .../googlebenchmark/googlebenchmark_1.9.1.bb | 20 +++++++++++++ 4 files changed, 20 insertions(+), 87 deletions(-) delete mode 100644 meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch delete mode 100644 meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch delete mode 100644 meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb create mode 100644 meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.1.bb (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch deleted file mode 100644 index 3017314abe..0000000000 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 28 May 2024 20:14:54 -0700 -Subject: [PATCH] cycleclock: Fix type conversion to match function return type - (#1794) - -fixes build with clang19 - -src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion] - 208 | return (static_cast(cycles_hi1) << 32) | cycles_lo; - | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ -1 error generated. - -Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9] -Signed-off-by: Khem Raj ---- - src/cycleclock.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/cycleclock.h b/src/cycleclock.h -index a25843760..c657414e5 100644 ---- a/src/cycleclock.h -+++ b/src/cycleclock.h -@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { - "sub %0, zero, %0\n" - "and %1, %1, %0\n" - : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); -- return (static_cast(cycles_hi1) << 32) | cycles_lo; -+ return static_cast((static_cast(cycles_hi1) << 32) | -+ cycles_lo); - #else - uint64_t cycles; - asm volatile("rdtime %0" : "=r"(cycles)); diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch deleted file mode 100644 index cc22a7e8a9..0000000000 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 54bca09aca6ccec41f852cb1f834463bc51290d0 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 10 Jun 2024 21:45:22 -0700 -Subject: [PATCH] cycleclock: Fix type conversion to match function return type - on riscv64 - -Fixes builds with clang - -src/cycleclock.h:213:10: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long') to 'int64_t' (aka 'long') [-Werror,-Wsign-conversion] - 213 | return cycles; - | ~~~~~~ ^~~~~~ - 1 error generated. - -Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1802] -Signed-off-by: Khem Raj ---- - src/cycleclock.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cycleclock.h b/src/cycleclock.h -index c657414..bd62f5d 100644 ---- a/src/cycleclock.h -+++ b/src/cycleclock.h -@@ -210,7 +210,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { - #else - uint64_t cycles; - asm volatile("rdtime %0" : "=r"(cycles)); -- return cycles; -+ return static_cast(cycles); - #endif - #elif defined(__e2k__) || defined(__elbrus__) - struct timeval tv; diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb deleted file mode 100644 index 706862f24a..0000000000 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "A microbenchmark support library" -HOMEPAGE = "https://github.com/google/benchmark" -SECTION = "libs" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ - file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch \ - file://0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch" -SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471" - -S = "${WORKDIR}/git" - -EXTRA_OECMAKE = " \ - -DBUILD_SHARED_LIBS=yes \ - -DBENCHMARK_ENABLE_TESTING=no \ - -DCMAKE_BUILD_TYPE=Release \ -" - -inherit cmake - -FILES:${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.1.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.1.bb new file mode 100644 index 0000000000..adab241baa --- /dev/null +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "A microbenchmark support library" +HOMEPAGE = "https://github.com/google/benchmark" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main" +SRCREV = "c58e6d0710581e3a08d65c349664128a8d9a2461" + +S = "${WORKDIR}/git" + +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=yes \ + -DBENCHMARK_ENABLE_TESTING=no \ + -DCMAKE_BUILD_TYPE=Release \ +" + +inherit cmake + +FILES:${PN}-dev += "${libdir}/cmake" -- cgit v1.2.3-54-g00ecf