From 1ddc77fcfdb77ade2c1a7a0a4298d12e7a4b1dd7 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Wed, 6 Jul 2022 11:35:04 +0200
Subject: [PATCH] Allow using openharmony.inc without enabling OpenHarmony
support
With this, the use of openharmony.inc will not change things unless
the `openharmony` distro feature is enabled.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
conf/distro/include/musl-ldso-paths.inc | 2 +-
conf/distro/include/openharmony.inc | 2 +-
conf/distro/include/openssl.inc | 44 ++++++++++++-------------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/conf/distro/include/musl-ldso-paths.inc b/conf/distro/include/musl-ldso-paths.inc
index 6a69bc70..7cd6c077 100644
--- a/conf/distro/include/musl-ldso-paths.inc
+++ b/conf/distro/include/musl-ldso-paths.inc
@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-MUSL_LDSO_PATHS = " \
+MUSL_LDSO_PATHS:df-openharmony = " \
module \
module/ability \
module/account \
diff --git a/conf/distro/include/openharmony.inc b/conf/distro/include/openharmony.inc
index 8965c424..de396b9c 100644
--- a/conf/distro/include/openharmony.inc
+++ b/conf/distro/include/openharmony.inc
@@ -23,7 +23,7 @@ DISTROOVERRIDES:append = "${OPENHARMONY_OVERRIDES}"
PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
# clang_rt.profile library is used in openharmony-standard build
-PACKAGECONFIG:pn-compiler-rt = "profile"
+PACKAGECONFIG:pn-compiler-rt:append:df-openharmony = " profile"
require openssl.inc
require java.inc
diff --git a/conf/distro/include/openssl.inc b/conf/distro/include/openssl.inc
index a295dcc5..f0be2d7e 100644
--- a/conf/distro/include/openssl.inc
+++ b/conf/distro/include/openssl.inc
@@ -5,29 +5,29 @@
# Configuration of OpenSSL recipe
# Disable various ciphers and protocols
-PACKAGECONFIG:pn-openssl = "no-bf no-camellia no-cast no-ct no-md2 no-rc5 no-rc2 no-ripemd no-rmd160 no-ssl2 no-ssl3 no-ssl3-method"
+PACKAGECONFIG:pn-openssl:df-openharmony = "no-bf no-camellia no-cast no-ct no-md2 no-rc5 no-rc2 no-ripemd no-rmd160 no-ssl2 no-ssl3 no-ssl3-method"
# Arm 32-bit configuration
-CFLAGS:pn-openssl:append:arm = " -DOPENSSL_CPUID_OBJ"
-CFLAGS:pn-openssl:append:arm = " -DOPENSSL_BN_ASM_MONT"
-CFLAGS:pn-openssl:append:arm = " -DOPENSSL_BN_ASM_GF2m"
-CFLAGS:pn-openssl:append:arm = " -DSHA1_ASM"
-CFLAGS:pn-openssl:append:arm = " -DSHA256_ASM"
-CFLAGS:pn-openssl:append:arm = " -DSHA512_ASM"
-CFLAGS:pn-openssl:append:arm = " -DKECCAK1600_ASM"
-CFLAGS:pn-openssl:append:arm = " -DAES_ASM"
-CFLAGS:pn-openssl:append:arm = " -DBSAES_ASM"
-CFLAGS:pn-openssl:append:arm = " -DGHASH_ASM"
-CFLAGS:pn-openssl:append:arm = " -DECP_NISTZ256_ASM"
-CFLAGS:pn-openssl:append:arm = " -DPOLY1305_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DOPENSSL_CPUID_OBJ"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DOPENSSL_BN_ASM_MONT"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DOPENSSL_BN_ASM_GF2m"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DSHA1_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DSHA256_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DSHA512_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DKECCAK1600_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DAES_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DBSAES_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DGHASH_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DECP_NISTZ256_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:arm = " -DPOLY1305_ASM"
# Arm 64-bit configuration
-CFLAGS:pn-openssl:append:aarch64 = " -DOPENSSL_CPUID_OBJ"
-CFLAGS:pn-openssl:append:aarch64 = " -DOPENSSL_BN_ASM_MONT"
-CFLAGS:pn-openssl:append:aarch64 = " -DSHA1_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DSHA256_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DSHA512_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DKECCAK1600_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DVPAES_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DECP_NISTZ256_ASM"
-CFLAGS:pn-openssl:append:aarch64 = " -DPOLY1305_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DOPENSSL_CPUID_OBJ"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DOPENSSL_BN_ASM_MONT"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DSHA1_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DSHA256_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DSHA512_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DKECCAK1600_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DVPAES_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DECP_NISTZ256_ASM"
+CFLAGS:pn-openssl:df-openharmony:append:aarch64 = " -DPOLY1305_ASM"
--
GitLab