From c6740ed4d4c5fcf0da424b8c157f689f7d25c0a5 Mon Sep 17 00:00:00 2001 From: heppen Date: Sat, 17 Jun 2023 22:53:06 +0800 Subject: [PATCH 1/2] add openssl BUILD.gn and include softlink. --- ...penssl-BUILD.gn-and-include-softlink.patch | 68 +++++++++++++++++++ distributed-build.spec | 6 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 0017-add-openssl-BUILD.gn-and-include-softlink.patch diff --git a/0017-add-openssl-BUILD.gn-and-include-softlink.patch b/0017-add-openssl-BUILD.gn-and-include-softlink.patch new file mode 100644 index 0000000..f7ce182 --- /dev/null +++ b/0017-add-openssl-BUILD.gn-and-include-softlink.patch @@ -0,0 +1,68 @@ +From ef15e1533c4446558f4c9f62b66b9298a74bc1e0 Mon Sep 17 00:00:00 2001 +From: heppen +Date: Sat, 17 Jun 2023 22:00:21 +0800 +Subject: [PATCH] add openssl BUILD.gn and include softlink + +--- + .../compiler_gn/third_party/openssl/BUILD.gn | 39 +++++++++++++++++++ + .../third_party/openssl/include/openssl | 1 + + 2 files changed, 40 insertions(+) + create mode 100644 openeuler/compiler_gn/third_party/openssl/BUILD.gn + create mode 120000 openeuler/compiler_gn/third_party/openssl/include/openssl + +diff --git a/openeuler/compiler_gn/third_party/openssl/BUILD.gn b/openeuler/compiler_gn/third_party/openssl/BUILD.gn +new file mode 100644 +index 0000000..7baa72f +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/openssl/BUILD.gn +@@ -0,0 +1,39 @@ ++# Copyright (c) 2020-2022 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. ++# You may obtain a copy of the License at ++# ++# http://www.apache.org/licenses/LICENSE-2.0 ++# ++# Unless required by applicable law or agreed to in writing, software ++# distributed under the License is distributed on an "AS IS" BASIS, ++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++# See the License for the specific language governing permissions and ++# limitations under the License. ++ ++import("//build/ohos.gni") ++ ++# Only use this to set/unset some cflags, use "platform" variable in gn template to add ++# source code for Windows. ++ ++config("libcrypto_config") { ++ include_dirs = [ "/usr/include/openssl" ] ++ libs = [ "crypto" ] ++} ++ ++ohos_static_library("libcrypto_static") { ++ public_configs = [ ":libcrypto_config" ] ++} ++ ++ohos_shared_library("libcrypto_shared") { ++ public_configs = [ ":libcrypto_config" ] ++} ++ ++config("libssl_config") { ++ include_dirs = [ "/usr/include/openssl" ] ++ libs = [ "ssl" ] ++} ++ ++ohos_shared_library("libssl_shared") { ++ public_configs = [ ":libssl_config" ] ++} +diff --git a/openeuler/compiler_gn/third_party/openssl/include/openssl b/openeuler/compiler_gn/third_party/openssl/include/openssl +new file mode 120000 +index 0000000..6c29d44 +--- /dev/null ++++ b/openeuler/compiler_gn/third_party/openssl/include/openssl +@@ -0,0 +1 @@ ++/usr/include/openssl +\ No newline at end of file +-- +2.33.0 + diff --git a/distributed-build.spec b/distributed-build.spec index 5063074..1788fa4 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: 3 +Release: 4 Summary: openEuler embedded softbus build tools License: Apache-2.0 URL: https://gitee.com/openharmony/build @@ -24,6 +24,7 @@ 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 Patch0016: 0016-fix-use-llvm15-path-on-x86_64.patch +Patch0017: 0017-add-openssl-BUILD.gn-and-include-softlink.patch BuildArch: noarch @@ -44,6 +45,9 @@ cp -rp %{_builddir}/build-%{openHarmony_source_release}/* %{buildroot}/opt/dist /opt/distributed-middleware-build %changelog +* Sat Jun 17 hepeng - 1.0.0-4 +- add openssl BUILD.gn and include softlink. + * Thu Jun 15 tianhang - 1.0.0-3 - use llvm15 path for strip on x86_64 -- Gitee From 183eac11d920ab037c80d7fb167b21adfef24b4f Mon Sep 17 00:00:00 2001 From: heppen Date: Sun, 18 Jun 2023 00:36:35 +0800 Subject: [PATCH 2/2] change to use group --- ...add-openssl-BUILD.gn-and-include-softlink.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/0017-add-openssl-BUILD.gn-and-include-softlink.patch b/0017-add-openssl-BUILD.gn-and-include-softlink.patch index f7ce182..98050a6 100644 --- a/0017-add-openssl-BUILD.gn-and-include-softlink.patch +++ b/0017-add-openssl-BUILD.gn-and-include-softlink.patch @@ -1,7 +1,7 @@ -From ef15e1533c4446558f4c9f62b66b9298a74bc1e0 Mon Sep 17 00:00:00 2001 +From 3cca2589c9269da09583861a396c3a9166563028 Mon Sep 17 00:00:00 2001 From: heppen -Date: Sat, 17 Jun 2023 22:00:21 +0800 -Subject: [PATCH] add openssl BUILD.gn and include softlink +Date: Sun, 18 Jun 2023 00:34:05 +0800 +Subject: [PATCH] add openssl BUILD.gn and include softlink. --- .../compiler_gn/third_party/openssl/BUILD.gn | 39 +++++++++++++++++++ @@ -12,7 +12,7 @@ Subject: [PATCH] add openssl BUILD.gn and include softlink diff --git a/openeuler/compiler_gn/third_party/openssl/BUILD.gn b/openeuler/compiler_gn/third_party/openssl/BUILD.gn new file mode 100644 -index 0000000..7baa72f +index 0000000..7b953eb --- /dev/null +++ b/openeuler/compiler_gn/third_party/openssl/BUILD.gn @@ -0,0 +1,39 @@ @@ -39,11 +39,11 @@ index 0000000..7baa72f + libs = [ "crypto" ] +} + -+ohos_static_library("libcrypto_static") { ++group("libcrypto_static") { + public_configs = [ ":libcrypto_config" ] +} + -+ohos_shared_library("libcrypto_shared") { ++group("libcrypto_shared") { + public_configs = [ ":libcrypto_config" ] +} + @@ -52,7 +52,7 @@ index 0000000..7baa72f + libs = [ "ssl" ] +} + -+ohos_shared_library("libssl_shared") { ++group("libssl_shared") { + public_configs = [ ":libssl_config" ] +} diff --git a/openeuler/compiler_gn/third_party/openssl/include/openssl b/openeuler/compiler_gn/third_party/openssl/include/openssl -- Gitee