diff --git a/0004-establish-kvstore-dependence-on-boundscheck.patch b/0004-establish-kvstore-dependence-on-boundscheck.patch index 1710e30..0ae69a7 100644 --- a/0004-establish-kvstore-dependence-on-boundscheck.patch +++ b/0004-establish-kvstore-dependence-on-boundscheck.patch @@ -1,16 +1,17 @@ -From 1514ae3615cd6c376e6413c8b63775de39d9a2c1 Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Mon, 17 Jul 2023 17:55:44 +0800 -Subject: [PATCH] establish kvstore dependence on boundscheck +From 09750a4c777c399bdaefaae74e4523a86b241e93 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Thu, 7 Mar 2024 16:26:29 +0800 +Subject: [PATCH] establish kvstore dependency on boundscheck --- - .../kv_store/frameworks/libs/distributeddb/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) + frameworks/libs/distributeddb/BUILD.gn | 1 + + .../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 ---- a/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn -+++ b/distributeddatamgr/kv_store/frameworks/libs/distributeddb/BUILD.gn +--- a/frameworks/libs/distributeddb/BUILD.gn ++++ b/frameworks/libs/distributeddb/BUILD.gn @@ -273,6 +273,7 @@ ohos_shared_library("distributeddb") { deps = [ "//third_party/sqlite:sqlite", @@ -19,6 +20,18 @@ index d08716e..536f8ee 100644 ] 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 +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 + + namespace DistributedDB { + namespace { -- -2.33.0 +2.43.0 diff --git a/distributeddatamgr_kv_store.spec b/distributeddatamgr_kv_store.spec index 952de70..6a84f1d 100644 --- a/distributeddatamgr_kv_store.spec +++ b/distributeddatamgr_kv_store.spec @@ -39,9 +39,9 @@ KV database (KV store) is developed based on the KV storage capability provided %prep rm -rf %{_builddir}/* cp -rf %{build_opt} %{_builddir}/build -ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh -ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn -ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py +[ ! -L "%{_builddir}/build.sh" ] && ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh +[ ! -L "%{_builddir}/.gn" ] && ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn +[ ! -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/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 -P2 -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 %ifarch x86_64