From 439a2af536c022e47ad8f79cda9603554811035e Mon Sep 17 00:00:00 2001 From: s_c_c Date: Sat, 29 Jun 2024 09:25:18 +0800 Subject: [PATCH 1/2] Remove c99 designator unrecognized option and fix sysroot for embedded --- ...mbedded-remove-c99-designator-cflags.patch | 27 +++++++++++++++++++ appdatafwk.BUILD.gn | 3 ++- dataability.BUILD.gn | 3 ++- distributeddatamgr_relational_store.spec | 7 ++++- rdb.BUILD.gn | 3 ++- 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 0003-feat-for-embedded-remove-c99-designator-cflags.patch diff --git a/0003-feat-for-embedded-remove-c99-designator-cflags.patch b/0003-feat-for-embedded-remove-c99-designator-cflags.patch new file mode 100644 index 0000000..db91eb1 --- /dev/null +++ b/0003-feat-for-embedded-remove-c99-designator-cflags.patch @@ -0,0 +1,27 @@ +From 5d1b0af28b71f3cea09a0e593182daaf9c8ea71f Mon Sep 17 00:00:00 2001 +From: s_c_c +Date: Fri, 28 Jun 2024 16:48:59 +0800 +Subject: [PATCH] feat for embedded remove c99 designator cflags + +--- + interfaces/inner_api/dataability/BUILD.gn | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/interfaces/inner_api/dataability/BUILD.gn b/interfaces/inner_api/dataability/BUILD.gn +index bd4c5c4..26778ec 100644 +--- a/interfaces/inner_api/dataability/BUILD.gn ++++ b/interfaces/inner_api/dataability/BUILD.gn +@@ -16,8 +16,8 @@ import("//foundation/distributeddatamgr/relational_store/relational_store.gni") + config("native_dataability_config") { + visibility = [ ":*" ] + +- cflags = [ "-Wc99-designator" ] +- cflags_cc = [ "-Wc99-designator" ] ++# cflags = [ "-Wc99-designator" ] ++# cflags_cc = [ "-Wc99-designator" ] + include_dirs = [ + "include", + "${relational_store_native_path}/dataability/include", +-- +2.45.2.windows.1 + diff --git a/appdatafwk.BUILD.gn b/appdatafwk.BUILD.gn index ae51fb3..cd25ce9 100644 --- a/appdatafwk.BUILD.gn +++ b/appdatafwk.BUILD.gn @@ -1,7 +1,8 @@ import("//build/ohos.gni") +import("//build/config/sysroot.gni") config("appdatafwk_public_config") { - include_dirs = [ "include" ] + include_dirs = [ "${sysroot}/usr/include/relational_store/" ] libs = [ "native_appdatafwk.z" ] } diff --git a/dataability.BUILD.gn b/dataability.BUILD.gn index 8cdd2ae..5d16073 100644 --- a/dataability.BUILD.gn +++ b/dataability.BUILD.gn @@ -1,7 +1,8 @@ import("//build/ohos.gni") +import("//build/config/sysroot.gni") config("native_dataability_public_config") { - include_dirs = [ "include" ] + include_dirs = [ "${sysroot}/usr/include/relational_store/" ] libs = [ "native_dataability.z" ] } diff --git a/distributeddatamgr_relational_store.spec b/distributeddatamgr_relational_store.spec index 31b57d6..81de02d 100644 --- a/distributeddatamgr_relational_store.spec +++ b/distributeddatamgr_relational_store.spec @@ -6,7 +6,7 @@ Name: distributeddatamgr_relational_store Version: 1.0.0 -Release: 3 +Release: 4 Summary: Local Relational Data Management from OpenHarmony License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_relational_store @@ -18,6 +18,7 @@ Source5: share.adapter.BUILD.gn Source6: rdb.BUILD.gn Patch1: 0001-remove-useless-dependencies.patch Patch2: 0002-establish-relational-store-dependence-on-boundscheck.patch +Patch3: 0003-feat-for-embedded-remove-c99-designator-cflags.patch BuildRequires: libboundscheck, libicu-devel, libxml2-devel BuildRequires: distributed-build, hilog, commonlibrary_c_utils @@ -50,6 +51,7 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/relationa %patch -P1 -p1 -d %{distributeddata_dir}/relational_store %patch -P2 -p1 -d %{_builddir}/foundation +%patch -P3 -p1 -d %{distributeddata_dir}/relational_store %build %ifarch x86_64 @@ -111,6 +113,9 @@ popd /system/* %changelog +* Fri Jun 28 2024 s_c_c - 1.0.0-4 +- Remove c99 designator unrecognized option and fix sysroot for embedded. + * Tue Nov 21 2023 Peng He - 1.0.0-3 - Update build requires and requires. diff --git a/rdb.BUILD.gn b/rdb.BUILD.gn index 8c9f1c3..f10d3cc 100644 --- a/rdb.BUILD.gn +++ b/rdb.BUILD.gn @@ -1,8 +1,9 @@ import("//build/ohos.gni") +import("//build/config/sysroot.gni") config("native_rdb_public_config") { include_dirs = [ - "include" + "${sysroot}/usr/include/relational_store/" ] libs = [ "native_rdb.z" ] } -- Gitee From c37f68ec538a411f3c3751ac25cda3b1b9a3a38f Mon Sep 17 00:00:00 2001 From: shichuchao Date: Tue, 20 Aug 2024 11:03:28 +0800 Subject: [PATCH 2/2] Fix public_config visibility for gn --- ...-Fix-public_config-visibility-for-gn.patch | 39 +++++++++++++++++++ distributeddatamgr_relational_store.spec | 7 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0004-Fix-public_config-visibility-for-gn.patch diff --git a/0004-Fix-public_config-visibility-for-gn.patch b/0004-Fix-public_config-visibility-for-gn.patch new file mode 100644 index 0000000..a00a410 --- /dev/null +++ b/0004-Fix-public_config-visibility-for-gn.patch @@ -0,0 +1,39 @@ +From 698b8973524e96fdc090fc5ae49ccb659d25adca Mon Sep 17 00:00:00 2001 +From: shichuchao +Date: Tue, 20 Aug 2024 10:56:31 +0800 +Subject: [PATCH] Fix public_config visibility for gn + +--- + interfaces/inner_api/dataability/BUILD.gn | 2 +- + interfaces/inner_api/rdb/BUILD.gn | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/interfaces/inner_api/dataability/BUILD.gn b/interfaces/inner_api/dataability/BUILD.gn +index 26778ec..2534d3e 100644 +--- a/interfaces/inner_api/dataability/BUILD.gn ++++ b/interfaces/inner_api/dataability/BUILD.gn +@@ -26,7 +26,7 @@ config("native_dataability_config") { + } + + config("native_dataability_public_config") { +- visibility = [ "//foundation/distributeddatamgr/relational_store:*" ] ++ visibility = [ ":*" ] + include_dirs = [ "include" ] + } + +diff --git a/interfaces/inner_api/rdb/BUILD.gn b/interfaces/inner_api/rdb/BUILD.gn +index 603e3dc..5c42da0 100644 +--- a/interfaces/inner_api/rdb/BUILD.gn ++++ b/interfaces/inner_api/rdb/BUILD.gn +@@ -62,7 +62,7 @@ config("native_rdb_config") { + } + + config("native_rdb_public_config") { +- visibility = [ "//foundation/distributeddatamgr/relational_store:*" ] ++ visibility = [ ":*" ] + + if (is_mingw || is_mac) { + include_dirs = [ +-- +2.28.0.windows.1 + diff --git a/distributeddatamgr_relational_store.spec b/distributeddatamgr_relational_store.spec index 81de02d..510cd91 100644 --- a/distributeddatamgr_relational_store.spec +++ b/distributeddatamgr_relational_store.spec @@ -6,7 +6,7 @@ Name: distributeddatamgr_relational_store Version: 1.0.0 -Release: 4 +Release: 5 Summary: Local Relational Data Management from OpenHarmony License: Apache-2.0 Url: https://gitee.com/openharmony/distributeddatamgr_relational_store @@ -19,6 +19,7 @@ Source6: rdb.BUILD.gn Patch1: 0001-remove-useless-dependencies.patch Patch2: 0002-establish-relational-store-dependence-on-boundscheck.patch Patch3: 0003-feat-for-embedded-remove-c99-designator-cflags.patch +Patch4: 0004-Fix-public_config-visibility-for-gn.patch BuildRequires: libboundscheck, libicu-devel, libxml2-devel BuildRequires: distributed-build, hilog, commonlibrary_c_utils @@ -52,6 +53,7 @@ mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/relationa %patch -P1 -p1 -d %{distributeddata_dir}/relational_store %patch -P2 -p1 -d %{_builddir}/foundation %patch -P3 -p1 -d %{distributeddata_dir}/relational_store +%patch -P4 -p1 -d %{distributeddata_dir}/relational_store %build %ifarch x86_64 @@ -113,6 +115,9 @@ popd /system/* %changelog +* Tue Aug 20 2024 s_c_c - 1.0.0-5 +- Fix public_config visibility for gn. + * Fri Jun 28 2024 s_c_c - 1.0.0-4 - Remove c99 designator unrecognized option and fix sysroot for embedded. -- Gitee