From d8d61425ae82a1840b2a1e224cde072b599d4f51 Mon Sep 17 00:00:00 2001 From: s_c_c Date: Sat, 29 Jun 2024 11:39:12 +0800 Subject: [PATCH 1/2] Fix permissive and include_dirs errors for embedded --- ...d-permissive-and-include_dirs-errors.patch | 96 +++++++++++++++++++ distributeddatamgr_datamgr_service.spec | 7 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 0003-feat-for-embedded-permissive-and-include_dirs-errors.patch diff --git a/0003-feat-for-embedded-permissive-and-include_dirs-errors.patch b/0003-feat-for-embedded-permissive-and-include_dirs-errors.patch new file mode 100644 index 0000000..b0620e0 --- /dev/null +++ b/0003-feat-for-embedded-permissive-and-include_dirs-errors.patch @@ -0,0 +1,96 @@ +From 7b0f91e31687521d1b5b22b2167e2245edebfc25 Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Sat, 29 Jun 2024 11:36:17 +0800 +Subject: [PATCH] feat for embedded permissive and include_dirs errors + +--- + services/distributeddataservice/adapter/communicator/BUILD.gn | 2 +- + services/distributeddataservice/adapter/dfx/BUILD.gn | 2 +- + services/distributeddataservice/app/BUILD.gn | 4 +++- + services/distributeddataservice/service/BUILD.gn | 4 +++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/services/distributeddataservice/adapter/communicator/BUILD.gn b/services/distributeddataservice/adapter/communicator/BUILD.gn +index 3b9cc42..936157b 100644 +--- a/services/distributeddataservice/adapter/communicator/BUILD.gn ++++ b/services/distributeddataservice/adapter/communicator/BUILD.gn +@@ -47,7 +47,7 @@ ohos_static_library("distributeddata_communicator_static") { + "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational", + ] + +- cflags_cc = [ "-fvisibility=hidden", ++ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w", + "-Wno-sign-compare",] + + deps = [ +diff --git a/services/distributeddataservice/adapter/dfx/BUILD.gn b/services/distributeddataservice/adapter/dfx/BUILD.gn +index a471f5f..4740781 100644 +--- a/services/distributeddataservice/adapter/dfx/BUILD.gn ++++ b/services/distributeddataservice/adapter/dfx/BUILD.gn +@@ -39,7 +39,7 @@ ohos_static_library("distributeddata_dfx_static") { + "//third_party/openssl/include/", + ] + +- cflags_cc = [ "-fvisibility=hidden" ] ++ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ] + + deps = [ + "../autils:distributeddata_autils_static", +diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn +index 1e97cb7..633a96b 100644 +--- a/services/distributeddataservice/app/BUILD.gn ++++ b/services/distributeddataservice/app/BUILD.gn +@@ -12,6 +12,7 @@ + # limitations under the License. + import("//build/ohos.gni") + import("//build/ohos_var.gni") ++import("//build/config/sysroot.gni") + import("//foundation/distributeddatamgr/datamgr_service/datamgr_service.gni") + + group("build_module") { +@@ -73,11 +74,12 @@ config("module_private_config") { + "src/security", + "src/backup_rule/include", + "//third_party/json/single_include", ++ "${sysroot}/usr/include/device_manager/", + ] + + cflags = [ "-Wno-multichar" ] + +- cflags_cc = [ "-fvisibility=hidden" ] ++ cflags_cc = [ "-fvisibility=hidden", "-fpermissive", "-w" ] + } + + ohos_shared_library("distributeddataservice") { +diff --git a/services/distributeddataservice/service/BUILD.gn b/services/distributeddataservice/service/BUILD.gn +index 3fb8263..f7879e0 100644 +--- a/services/distributeddataservice/service/BUILD.gn ++++ b/services/distributeddataservice/service/BUILD.gn +@@ -12,6 +12,7 @@ + # limitations under the License. + import("//build/ohos.gni") + import("//build/ohos_var.gni") ++import("//build/config/sysroot.gni") + + group("build_module") { + deps = [ ":distributeddatasvc" ] +@@ -47,6 +48,7 @@ config("module_public_config") { + "//foundation/distributeddatamgr/kv_store/frameworks/libs/distributeddb/interfaces/include/relational", + "//foundation/distributedhardware/device_manager/interfaces/inner_kits/native_cpp/include", + "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", ++ "${sysroot}/usr/include/device_manager/", + ] + } + +@@ -101,7 +103,7 @@ ohos_shared_library("distributeddatasvc") { + ] + cflags = [ "-Wno-multichar" ] + +- cflags_cc = [ "-fvisibility=hidden", "-Wno-format" ] ++ cflags_cc = [ "-fvisibility=hidden", "-Wno-format", "-fpermissive", "-w" ] + + configs = [ ":module_public_config" ] + +-- +2.45.2.windows.1 + diff --git a/distributeddatamgr_datamgr_service.spec b/distributeddatamgr_datamgr_service.spec index 3d6ce08..9f82a23 100644 --- a/distributeddatamgr_datamgr_service.spec +++ b/distributeddatamgr_datamgr_service.spec @@ -5,13 +5,14 @@ Name: distributeddatamgr_datamgr_service Version: 1.0.0 -Release: 3 +Release: 4 Summary: Distributed data manager that provides the capability to store data in the databases of different devices License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_datamgr_service Source1: https://gitee.com/openharmony/distributeddatamgr_datamgr_service/repository/archive/%{oh_version}.tar.gz#/distributeddatamgr_datamgr_service-%{oh_version}.tar.gz Patch1: 0001-remove-useless-dependency.patch Patch2: 0002-establish-kvstore-dependence-on-boundscheck.patch +Patch3: 0003-feat-for-embedded-permissive-and-include_dirs-errors.patch BuildRequires: libboundscheck, zlib, zlib-devel, jsoncpp, jsoncpp-devel, compat-openssl11-devel BuildRequires: distributed-build, distributed-beget, hilog, commonlibrary_c_utils @@ -52,6 +53,7 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/datamgr_s %patch -P1 -p1 -d %{distributeddata_dir}/datamgr_service %patch -P2 -p1 -d %{distributeddata_dir}/datamgr_service +%patch -P3 -p1 -d %{distributeddata_dir}/datamgr_service %build %ifarch x86_64 @@ -88,6 +90,9 @@ install -m 0755 %{_builddir}/%{config_path}/etc/distributeddata/conf/* %{buildro /system/* %changelog +* Sat Jun 29 2024 s_c_c - 1.0.0-4 +- Fix permissive and include_dirs errors for embedded. + * Tue Nov 21 2023 Peng He - 1.0.0-3 - Update build requires and requires. -- Gitee From 50e27f21c2db714845efe62aa5fe5690919ff6cf Mon Sep 17 00:00:00 2001 From: s_c_c Date: Mon, 2 Sep 2024 17:48:09 +0800 Subject: [PATCH 2/2] Fix distributeddata_adapter_public_config visibility for gn. --- ...ata_adapter_public_config-visibility.patch | 25 +++++++++++++++++++ distributeddatamgr_datamgr_service.spec | 10 +++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0004-fix-distributeddata_adapter_public_config-visibility.patch diff --git a/0004-fix-distributeddata_adapter_public_config-visibility.patch b/0004-fix-distributeddata_adapter_public_config-visibility.patch new file mode 100644 index 0000000..d7c9be6 --- /dev/null +++ b/0004-fix-distributeddata_adapter_public_config-visibility.patch @@ -0,0 +1,25 @@ +From 56cbddb6351234705a581d66674f2f50650ae419 Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Mon, 2 Sep 2024 17:41:36 +0800 +Subject: [PATCH] fix distributeddata_adapter_public_config visibility + +--- + services/distributeddataservice/adapter/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/distributeddataservice/adapter/BUILD.gn b/services/distributeddataservice/adapter/BUILD.gn +index 1a77c98..baec889 100644 +--- a/services/distributeddataservice/adapter/BUILD.gn ++++ b/services/distributeddataservice/adapter/BUILD.gn +@@ -23,7 +23,7 @@ config("distributeddata_adapter_private_config") { + } + + config("distributeddata_adapter_public_config") { +- visibility = [ "//foundation/distributeddatamgr/datamgr_service:*" ] ++ visibility = [ ":*" ] + + include_dirs = [ + "include/log", +-- +2.45.2.windows.1 + diff --git a/distributeddatamgr_datamgr_service.spec b/distributeddatamgr_datamgr_service.spec index 9f82a23..2ef83a7 100644 --- a/distributeddatamgr_datamgr_service.spec +++ b/distributeddatamgr_datamgr_service.spec @@ -5,7 +5,7 @@ Name: distributeddatamgr_datamgr_service Version: 1.0.0 -Release: 4 +Release: 5 Summary: Distributed data manager that provides the capability to store data in the databases of different devices License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_datamgr_service @@ -13,6 +13,7 @@ Source1: https://gitee.com/openharmony/distributeddatamgr_datamgr_service/rep Patch1: 0001-remove-useless-dependency.patch Patch2: 0002-establish-kvstore-dependence-on-boundscheck.patch Patch3: 0003-feat-for-embedded-permissive-and-include_dirs-errors.patch +Patch4: 0004-fix-distributeddata_adapter_public_config-visibility.patch BuildRequires: libboundscheck, zlib, zlib-devel, jsoncpp, jsoncpp-devel, compat-openssl11-devel BuildRequires: distributed-build, distributed-beget, hilog, commonlibrary_c_utils @@ -54,6 +55,7 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/datamgr_s %patch -P1 -p1 -d %{distributeddata_dir}/datamgr_service %patch -P2 -p1 -d %{distributeddata_dir}/datamgr_service %patch -P3 -p1 -d %{distributeddata_dir}/datamgr_service +%patch -P4 -p1 -d %{distributeddata_dir}/datamgr_service %build %ifarch x86_64 @@ -90,6 +92,12 @@ install -m 0755 %{_builddir}/%{config_path}/etc/distributeddata/conf/* %{buildro /system/* %changelog +* Mon Sep 2 2024 s_c_c - 1.0.0-5 +- Fix distributeddata_adapter_public_config visibility for gn. + +* Sat Jun 29 2024 s_c_c - 1.0.0-4 +- Fix permissive and include_dirs errors for embedded. + * Sat Jun 29 2024 s_c_c - 1.0.0-4 - Fix permissive and include_dirs errors for embedded. -- Gitee