From bd1fac99d8102ead7ca3144019534f700281754e Mon Sep 17 00:00:00 2001 From: tian2020 Date: Thu, 15 Jun 2023 17:23:56 +0800 Subject: [PATCH] feat:use llvm15 path for strip on x86_64 --- 0016-fix-use-llvm15-path-on-x86_64.patch | 24 ++++++++++++++++++++++++ distributed-build.spec | 8 ++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 0016-fix-use-llvm15-path-on-x86_64.patch diff --git a/0016-fix-use-llvm15-path-on-x86_64.patch b/0016-fix-use-llvm15-path-on-x86_64.patch new file mode 100644 index 0000000..2b2d7c4 --- /dev/null +++ b/0016-fix-use-llvm15-path-on-x86_64.patch @@ -0,0 +1,24 @@ +From 0b07bcf8a6550a98c5b87b9da2bc9ac41af1bf4e Mon Sep 17 00:00:00 2001 +From: tian2020 +Date: Thu, 15 Jun 2023 17:16:03 +0800 +Subject: [PATCH] fix: use llvm15 path on x86_64 + +--- + toolchain/linux/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/toolchain/linux/BUILD.gn b/toolchain/linux/BUILD.gn +index 353b13d..a8c2f78 100755 +--- a/toolchain/linux/BUILD.gn ++++ b/toolchain/linux/BUILD.gn +@@ -121,7 +121,6 @@ clang_toolchain("linux_clang_x86_64") { + # Output linker map files for binary size analysis. + enable_linker_map = true + toolprefix = "/usr/bin/" +- strip = "/usr/bin/llvm-strip" + toolchain_args = { + current_cpu = "x64" + current_os = "linux" +-- +2.33.0 + diff --git a/distributed-build.spec b/distributed-build.spec index a705081..5063074 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: 2 +Release: 3 Summary: openEuler embedded softbus build tools License: Apache-2.0 URL: https://gitee.com/openharmony/build @@ -22,7 +22,8 @@ Patch0011: 0011-feat-use-.z-for-libs-name.patch Patch0012: 0012-fix-rpm-build-fail-caused-by-wrong-useless-code.patch Patch0013: 0013-feature-use-llvm-tools-version-15-for-build.patch Patch0014: 0014-feat-delete-the-default-sqlite-deps.patch -Patch0015: 0015-feat-and-hilog-gn-files.patch +Patch0015: 0015-feat-and-hilog-gn-files.patch +Patch0016: 0016-fix-use-llvm15-path-on-x86_64.patch BuildArch: noarch @@ -43,6 +44,9 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist /opt/distributed-middleware-build %changelog +* Thu Jun 15 tianhang - 1.0.0-3 +- use llvm15 path for strip on x86_64 + * Thu Jun 15 tianhang - 1.0.0-2 - add hilog compile gn files and remove default sqlite deps -- Gitee