diff --git a/conf/distro/include/musl-ldso-paths.inc b/conf/distro/include/musl-ldso-paths.inc index 6a69bc70566edbbff816a4edd4375b77d38fd379..7cd6c07742c4c26da2aae31bfe9b829431644611 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 8965c42402395d80b5ad98fd0df48c25fc5d3518..de396b9c00d86cf23759b99c80465c7eeccc285d 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 a295dcc57e564e410d228d79b4183d61437769c8..f0be2d7e29f3f2434613c80beaac39dd7422b845 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"