代码拉取完成,页面将自动刷新
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
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。