packages/distributeddatamgr_kv_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some build errors

Browse Source
This commit is contained in:
heppen 2024-03-07 16:58:14 +08:00
parent fbd7954940
commit e3a433bfc2
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0004-establish-kvstore-dependence-on-boundscheck.patch
View File

@ -1,16 +1,17 @@
From 1514ae3615cd6c376e6413c8b63775de39d9a2c1 Mon Sep 17 00:00:00 2001 From 09750a4c777c399bdaefaae74e4523a86b241e93 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com> From: heppen <hepeng68@huawei.com>
Date: Mon, 17 Jul 2023 17:55:44 +0800 Date: Thu, 7 Mar 2024 16:26:29 +0800
Subject: [PATCH] establish kvstore dependence on boundscheck Subject: [PATCH] establish kvstore dependency on boundscheck
--- ---
.../kv_store/frameworks/libs/distributeddb/BUILD.gn | 1 + frameworks/libs/distributeddb/BUILD.gn | 1 +
1 file changed, 1 insertion(+) .../libs/distributeddb/communicator/src/protocol_proto.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn b/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn diff --git a/frameworks/libs/distributeddb/BUILD.gn b/frameworks/libs/distributeddb/BUILD.gn
index d08716e..536f8ee 100644 index d08716e..536f8ee 100644
--- a/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn --- a/frameworks/libs/distributeddb/BUILD.gn
+++ b/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn +++ b/frameworks/libs/distributeddb/BUILD.gn
@@ -273,6 +273,7 @@ ohos_shared_library("distributeddb") { @@ -273,6 +273,7 @@ ohos_shared_library("distributeddb") {
deps = [ deps = [
"//third_party/sqlite:sqlite", "//third_party/sqlite:sqlite",
@ -19,6 +20,18 @@ index d08716e..536f8ee 100644
] ]
configs += [ "//third_party/jsoncpp:jsoncpp_config" ] configs += [ "//third_party/jsoncpp:jsoncpp_config" ]
-- diff --git a/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp b/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
2.33.0 index 6e58a47..4d9325f 100644
--- a/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
+++ b/frameworks/libs/distributeddb/communicator/src/protocol_proto.cpp
@@ -24,6 +24,7 @@
#include "macro_utils.h"
#include "endian_convert.h"
#include "header_converter.h"
+#include <mutex>
namespace DistributedDB {
namespace {
--
2.43.0

8
distributeddatamgr_kv_store.spec
View File

@ -39,9 +39,9 @@ KV database (KV store) is developed based on the KV storage capability provided
%prep %prep
rm -rf %{_builddir}/* rm -rf %{_builddir}/*
cp -rf %{build_opt} %{_builddir}/build cp -rf %{build_opt} %{_builddir}/build
ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh [ ! -L "%{_builddir}/build.sh" ] && ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh
ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn [ ! -L "%{_builddir}/.gn" ] && ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn
ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py [ ! -L "%{_builddir}/build.py" ] && ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py
cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/ cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/
cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir} cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}
@ -54,7 +54,7 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/kv_store
%patch -P1 -p1 -d %{distributeddata_dir}/kv_store %patch -P1 -p1 -d %{distributeddata_dir}/kv_store
%patch -P2 -p1 -d %{distributeddata_dir}/kv_store %patch -P2 -p1 -d %{distributeddata_dir}/kv_store
%patch -P3 -p1 -d %{distributeddata_dir}/kv_store %patch -P3 -p1 -d %{distributeddata_dir}/kv_store
%patch -P4 -p1 -d %{_builddir}/foundation %patch -P4 -p1 -d %{distributeddata_dir}/kv_store
%build %build
%ifarch x86_64 %ifarch x86_64