Skip to content
Snippets Groups Projects
Commit 1ddc77fc authored by Esben Haabendal's avatar Esben Haabendal
Browse files

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: default avatarEsben Haabendal <esben.haabendal@huawei.com>
parent 9221133a
No related branches found
No related tags found
1 merge request!36Prepare for integration into meta-oniro-core
......@@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
MUSL_LDSO_PATHS = " \
MUSL_LDSO_PATHS:df-openharmony = " \
module \
module/ability \
module/account \
......
......@@ -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
......
......@@ -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"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment