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

The dependency path of the third-party is optimized

Browse Source 
Signed-off-by: beiling.xie <xiekunxun@huawei.com>
This commit is contained in:
beiling.xie 2022-12-19 17:59:45 +08:00 committed by openeuler-ci-bot
parent a9b364b1f6
commit 2915600be0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dsoftbus.spec
View File

@ -14,7 +14,7 @@
Name: dsoftbus Name: dsoftbus
Version: 1.0.0 Version: 1.0.0
Release: 4 Release: 5
Summary: openEuler embedded softbus capability support Summary: openEuler embedded softbus capability support
License: Apache License 2.0 License: Apache License 2.0
Url: https://openeuler.gitee.io/yocto-meta-openeuler/features/distributed_softbus.html Url: https://openeuler.gitee.io/yocto-meta-openeuler/features/distributed_softbus.html
@ -199,6 +199,9 @@ ${dsoftbus_build_dir}/third_party/bounds_checking_function/include/*.h \
/data/data /data/data
%changelog %changelog
* Mon Dec 19 2022 beiling.xie <xiekunxun@huawei.com> - 1.0.0-5
- The dependency path of the third-party is optimized
* Mon Dec 19 2022 beiling.xie <xiekunxun@huawei.com> - 1.0.0-4 * Mon Dec 19 2022 beiling.xie <xiekunxun@huawei.com> - 1.0.0-4
- rename patch for each modules - rename patch for each modules

2
libboundscheck-0001-Adaptation-for-dsoftbus.patch
View File

@ -29,7 +29,7 @@ index 0000000..9bec199
+# limitations under the License. +# limitations under the License.
+ +
+config("libsec_public_config") { +config("libsec_public_config") {
+ libs = [ "/usr/lib64/libboundscheck.so" ] + libs = [ "boundscheck" ]
+} +}
+ +
+group("libsec_static") { +group("libsec_static") {

15
third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch
View File

@ -1,20 +1,20 @@
From 7100861f832c43ef9b272666989f3ffd5107bc7a Mon Sep 17 00:00:00 2001 From 6c9dc0807972a3183d9348b654e46bc0126c27e6 Mon Sep 17 00:00:00 2001
From: "beiling.xie" <xiekunxun@huawei.com> From: "beiling.xie" <xiekunxun@huawei.com>
Date: Thu, 10 Nov 2022 11:04:23 +0800 Date: Thu, 10 Nov 2022 11:04:23 +0800
Subject: [PATCH] adapter cjson in openEuler for softbus Subject: [PATCH] adapter cjson in openEuler for softbus
Signed-off-by: beiling.xie <xiekunxun@huawei.com> Signed-off-by: beiling.xie <xiekunxun@huawei.com>
--- ---
BUILD.gn | 25 ++++++++++++++++++++++++++ BUILD.gn | 26 ++++++++++++++++++++++++++
1 file changed, 25 insertions(+) 1 file changed, 26 insertions(+)
create mode 100755 BUILD.gn create mode 100755 BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
new file mode 100755 new file mode 100755
index 0000000..b15e1db index 0000000..e704680
--- /dev/null --- /dev/null
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -0,0 +1,25 @@ @@ -0,0 +1,26 @@
+#Copyright (c) 2019-2021 Huawei Device Co., Ltd. +#Copyright (c) 2019-2021 Huawei Device Co., Ltd.
+#Licensed under the Apache License, Version 2.0 (the "License"); +#Licensed under the Apache License, Version 2.0 (the "License");
+#you may not use this file except in compliance with the License. +#you may not use this file except in compliance with the License.
@ -29,9 +29,10 @@ index 0000000..b15e1db
+#limitations under the License. +#limitations under the License.
+ +
+import("//build/ohos.gni") +import("//build/ohos.gni")
+import("//build/config/sysroot.gni")
+config("cJSON_config") { +config("cJSON_config") {
+ include_dirs = [ "/usr/include/cjson" ] + include_dirs = [ "${sysroot}/usr/include/cjson" ]
+ libs = [ "/usr/lib64/libcjson.so.1" ] + libs = [ "cjson" ]
+} +}
+ohos_static_library("cjson_static") { +ohos_static_library("cjson_static") {
+ public_configs = [ ":cJSON_config" ] + public_configs = [ ":cJSON_config" ]