All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [meta-oe][PATCH 02/13] rocksdb: Fix build with gcc13
Date: Wed, 25 Jan 2023 23:17:24 -0800	[thread overview]
Message-ID: <20230126071735.2444745-2-raj.khem@gmail.com> (raw)
In-Reply-To: <20230126071735.2444745-1-raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-missing-includes-cstdint-and-cstdio.patch | 70 +++++++++++++++++++
 meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb  |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch

diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
new file mode 100644
index 0000000000..1c505f7e18
--- /dev/null
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
@@ -0,0 +1,70 @@
+From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing includes <cstdint> and <cstdio>
+
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
+ storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
+ .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h    | 1 +
+ storage/rocksdb/rocksdb/util/slice.cc                            | 1 +
+ storage/rocksdb/rocksdb/util/string_util.h                       | 1 +
+ tpool/aio_linux.cc                                               | 1 +
+ 6 files changed, 6 insertions(+)
+
+--- a/db/compaction/compaction_iteration_stats.h
++++ b/db/compaction/compaction_iteration_stats.h
+@@ -7,6 +7,7 @@
+ 
+ #include <cstdint>
+ 
++#include <cstdint>
+ #include "rocksdb/rocksdb_namespace.h"
+ 
+ namespace ROCKSDB_NAMESPACE {
+--- a/include/rocksdb/utilities/checkpoint.h
++++ b/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "rocksdb/status.h"
+--- a/table/block_based/data_block_hash_index.h
++++ b/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+--- a/util/slice.cc
++++ b/util/slice.cc
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ 
+ #include <algorithm>
++#include <cstdint>
+ 
+ #include "rocksdb/convenience.h"
+ #include "rocksdb/slice_transform.h"
+--- a/util/string_util.h
++++ b/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
index d4f0346ee1..b9416988cf 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb
@@ -12,6 +12,7 @@ SRCBRANCH = "7.5.fb"
 SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
            file://0001-cmake-Add-check-for-atomic-support.patch \
            file://0001-cmake-Use-exported-target-for-bz2.patch \
+           file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
            file://ppc64.patch \
            file://mips.patch \
            file://arm.patch \
-- 
2.39.1



  reply	other threads:[~2023-01-26  7:17 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-26  7:17 [meta-oe][PATCH 01/13] vulkan-cts,opengl-es-cts: Fix build with gcc-13 Khem Raj
2023-01-26  7:17 ` Khem Raj [this message]
2023-01-26  7:17 ` [meta-oe][PATCH 03/13] rocksdb: Upgrade to 7.9.2 Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 04/13] redis-plus-plus: Upgrade to 1.3.7 Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 05/13] redis-plus-plus: Fix build with gcc13 Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 06/13] rdfind: Upgrade to 1.5.0 release Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 07/13] rdfind: Fix build with gcc13 Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 08/13] libiodbc: Fix SRC_URI to not use gitlab archives Khem Raj
2023-01-26  7:17 ` [meta-networking][PATCH 09/13] opensaf: Fix build with gcc13 Khem Raj
2023-01-26  7:17 ` [meta-multimedia][PATCH 10/13] crossguid: " Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 11/13] dbus-cxx: " Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 12/13] dbus-cxx: Upgrade to 2.3.1 Khem Raj
2023-01-26  7:17 ` [meta-oe][PATCH 13/13] msktutil: Upgrade to 1.2.1 Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230126071735.2444745-2-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.