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 0000000000000000000000000000000000000000..db91eb15b7d89d7a5437504d743ddafc3ea6fae8 --- /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 ae51fb37a35ca948f964a2d95d76ac79e4503806..cd25ce9e151f4fae2da2004530829b3d7d06f7a9 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 8cdd2ae8910c12fc0d245cb74b977dec2f8c46b2..5d160731e56f7f51f68633678f86e461c209bb18 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 31b57d6ceb1af79103d53ba28b2c205c6bb3659a..81de02d8482d4074b3aff71b10239cc0e2726585 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 8c9f1c3161dd9d30b930e3d65dae3c476b354554..f10d3cc4e40d30419427bcead13bb45c6f3fd43e 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" ] }