From 5026936d69f27e88e294d89ee4bd6ec7bd1a890f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 Oct 2023 10:01:42 -0700 Subject: leveldb: Print uint64_t with PRI64 Signed-off-by: Khem Raj (cherry picked from commit 1319827ed9f4af10380fc7e53a2f0e5a0844d5e1) Signed-off-by: Armin Kuster --- .../0001-Fix-printing-64-bit-integer-types.patch | 43 ++++++++++++++++++++++ meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch diff --git a/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch new file mode 100644 index 0000000000..b9f45e773d --- /dev/null +++ b/meta-oe/recipes-dbs/leveldb/leveldb/0001-Fix-printing-64-bit-integer-types.patch @@ -0,0 +1,43 @@ +From 1ccdb7513a7a0f24b8ce3b6766e52e690874bc64 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Oct 2023 19:08:12 -0700 +Subject: [PATCH] Fix printing 64-bit integer types + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + db/db_impl.cc | 5 +++-- + db/version_edit.h | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/db/db_impl.cc ++++ b/db/db_impl.cc +@@ -5,6 +5,7 @@ + #include "db/db_impl.h" + + #include ++#include + #include + #include + #include +@@ -520,8 +521,8 @@ Status DBImpl::WriteLevel0Table(MemTable + mutex_.Lock(); + } + +- Log(options_.info_log, "Level-0 table #%llu: %lld bytes %s", +- (unsigned long long)meta.number, (unsigned long long)meta.file_size, ++ Log(options_.info_log, "Level-0 table #%" PRIu64 " : %" PRIu64 " bytes %s", ++ meta.number, meta.file_size, + s.ToString().c_str()); + delete iter; + pending_outputs_.erase(meta.number); +--- a/db/version_edit.h ++++ b/db/version_edit.h +@@ -5,6 +5,7 @@ + #ifndef STORAGE_LEVELDB_DB_VERSION_EDIT_H_ + #define STORAGE_LEVELDB_DB_VERSION_EDIT_H_ + ++#include + #include + #include + #include diff --git a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb index ab0176ff9b..60b486df78 100644 --- a/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb +++ b/meta-oe/recipes-dbs/leveldb/leveldb_1.23.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=92d1b128950b11ba8495b64938fc164d" SRC_URI = "gitsm://github.com/google/${BPN}.git;branch=main;protocol=https \ file://0001-CMakeLists.txt-fix-googletest-related-options.patch \ + file://0001-Fix-printing-64-bit-integer-types.patch \ file://run-ptest \ " -- cgit v1.2.3-54-g00ecf