From 23e94262bdf795747c806aac2d26f2e6c8011984 Mon Sep 17 00:00:00 2001 From: "beiling.xie" Date: Mon, 19 Dec 2022 17:59:45 +0800 Subject: [PATCH] The dependency path of the third-party is optimized Signed-off-by: beiling.xie --- dsoftbus.spec | 5 ++++- libboundscheck-0001-Adaptation-for-dsoftbus.patch | 2 +- ...1-adapter-cjson-in-openEuler-for-softbus.patch | 15 ++++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dsoftbus.spec b/dsoftbus.spec index f099bed..d4b7786 100644 --- a/dsoftbus.spec +++ b/dsoftbus.spec @@ -14,7 +14,7 @@ Name: dsoftbus Version: 1.0.0 -Release: 4 +Release: 5 Summary: openEuler embedded softbus capability support License: Apache License 2.0 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 %changelog +* Mon Dec 19 2022 beiling.xie - 1.0.0-5 +- The dependency path of the third-party is optimized + * Mon Dec 19 2022 beiling.xie - 1.0.0-4 - rename patch for each modules diff --git a/libboundscheck-0001-Adaptation-for-dsoftbus.patch b/libboundscheck-0001-Adaptation-for-dsoftbus.patch index 0fc8eb4..054c707 100644 --- a/libboundscheck-0001-Adaptation-for-dsoftbus.patch +++ b/libboundscheck-0001-Adaptation-for-dsoftbus.patch @@ -29,7 +29,7 @@ index 0000000..9bec199 +# limitations under the License. + +config("libsec_public_config") { -+ libs = [ "/usr/lib64/libboundscheck.so" ] ++ libs = [ "boundscheck" ] +} + +group("libsec_static") { diff --git a/third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch b/third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch index 73c0505..5e5e975 100644 --- a/third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch +++ b/third-party-cjson-0001-adapter-cjson-in-openEuler-for-softbus.patch @@ -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" Date: Thu, 10 Nov 2022 11:04:23 +0800 Subject: [PATCH] adapter cjson in openEuler for softbus Signed-off-by: beiling.xie --- - BUILD.gn | 25 ++++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) + BUILD.gn | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) create mode 100755 BUILD.gn diff --git a/BUILD.gn b/BUILD.gn new file mode 100755 -index 0000000..b15e1db +index 0000000..e704680 --- /dev/null +++ b/BUILD.gn -@@ -0,0 +1,25 @@ +@@ -0,0 +1,26 @@ +#Copyright (c) 2019-2021 Huawei Device Co., Ltd. +#Licensed under the Apache License, Version 2.0 (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. + +import("//build/ohos.gni") ++import("//build/config/sysroot.gni") +config("cJSON_config") { -+ include_dirs = [ "/usr/include/cjson" ] -+ libs = [ "/usr/lib64/libcjson.so.1" ] ++ include_dirs = [ "${sysroot}/usr/include/cjson" ] ++ libs = [ "cjson" ] +} +ohos_static_library("cjson_static") { + public_configs = [ ":cJSON_config" ] -- Gitee