From 57782ade71edfc6a685b77d05f48d75102ed02d0 Mon Sep 17 00:00:00 2001
From: s_c_c <shichuchao@huawei.com>
Date: Fri, 28 Jun 2024 15:22:24 +0800
Subject: [PATCH] Fix jsoncpp icu and zlib sysroot path for embedded

---
 ...mbedded-fix-jsoncpp-icu-zlib-sysroot.patch | 66 +++++++++++++++++++
 distributed-build.spec                        |  6 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch

diff --git a/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch b/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch
new file mode 100644
index 0000000..1f43f70
--- /dev/null
+++ b/0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch
@@ -0,0 +1,66 @@
+From 4f8c781a40cae211fa28dec3220509c23f68fd1c Mon Sep 17 00:00:00 2001
+From: s_c_c <shichuchao@huawei.com>
+Date: Fri, 28 Jun 2024 15:19:19 +0800
+Subject: [PATCH] feat for embedded fix jsoncpp icu zlib sysroot
+
+---
+ openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn | 5 +++--
+ openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn   | 4 ++--
+ openeuler/compiler_gn/third_party/zlib/BUILD.gn      | 3 ++-
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
+index ac57abf..6fdfc7b 100644
+--- a/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
++++ b/openeuler/compiler_gn/third_party/icu/icu4c/BUILD.gn
+@@ -1,7 +1,8 @@
+ import("//build/ohos.gni")
++import("//build/config/sysroot.gni")
+ 
+ config("icuuc_config"){
+-  include_dirs = [ "/usr/include/unicode" ]
++  include_dirs = [ "${sysroot}/usr/include/unicode" ]
+   libs = [ "icuuc" ]
+ }
+ 
+@@ -10,7 +11,7 @@ group("shared_icuuc") {
+ }
+ 
+ config("icui18n_config"){ 
+-  include_dirs = [ "/usr/include/unicode" ]
++  include_dirs = [ "${sysroot}/usr/include/unicode" ]
+   libs = [ "icui18n" ]
+ }
+ 
+diff --git a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
+index 2264d70..5abc48e 100644
+--- a/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
++++ b/openeuler/compiler_gn/third_party/jsoncpp/BUILD.gn
+@@ -1,8 +1,8 @@
+ import("//build/ohos.gni")
+-
++import("//build/config/sysroot.gni")
+ 
+ config("jsoncpp_config") {
+-  include_dirs = [ "/usr/include/json" ]
++  include_dirs = [ "${sysroot}/usr/include/json" ]
+   libs = ["jsoncpp"]
+ }
+ 
+diff --git a/openeuler/compiler_gn/third_party/zlib/BUILD.gn b/openeuler/compiler_gn/third_party/zlib/BUILD.gn
+index 1837ef8..00cb0de 100644
+--- a/openeuler/compiler_gn/third_party/zlib/BUILD.gn
++++ b/openeuler/compiler_gn/third_party/zlib/BUILD.gn
+@@ -1,7 +1,8 @@
+ import("//build/ohos.gni")
++import("//build/config/sysroot.gni")
+ 
+ config("zlib_config") {
+-  include_dirs = [ "/usr/include" ]
++  include_dirs = [ "${sysroot}/usr/include" ]
+   libs = [ "z" ]
+ }
+ 
+-- 
+2.45.2.windows.1
+
diff --git a/distributed-build.spec b/distributed-build.spec
index 04fffcf..90caac7 100644
--- a/distributed-build.spec
+++ b/distributed-build.spec
@@ -2,7 +2,7 @@
 %global openHarmony_source_release OpenHarmony-v3.2-Release
 Name:      distributed-build
 Version:   1.0.0
-Release:   9
+Release:   10
 Summary:   openEuler embedded softbus build tools
 License:   Apache-2.0
 URL:       https://gitee.com/openharmony/build
@@ -33,6 +33,7 @@ Patch0022: 0022-add-build-gn-file-of-icu-jsoncpp-zlib.patch
 Patch0023: 0023-feat-for-embedded-comment-out-sysroot_hash.patch
 Patch0024: 0024-feat-for-embedded-add-linux_arm64-toolchain.patch
 Patch0025: 0025-feat-for-embedded-fix-sysroot-path.patch
+Patch0026: 0026-feat-for-embedded-fix-jsoncpp-icu-zlib-sysroot.patch
 BuildArch: noarch
 
 %description
@@ -52,6 +53,9 @@ cp -rp  %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist
 /opt/distributed-middleware-build
 
 %changelog
+* Thu Jun 27 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-10
+- Fix jsoncpp icu and zlib sysroot path for embedded
+
 * Tue Mar 12 2024 s_c_c <shichuchao@huawei.com> - 1.0.0-9
 - Fix sysroot path and add toolchain for embedded
 
-- 
Gitee