From fd1df244fe8701d6ff7eba2e855f794265cc80e9 Mon Sep 17 00:00:00 2001
From: Thierry Escande <thierry.escande@huawei.com>
Date: Mon, 27 Jun 2022 16:48:28 +0200
Subject: [PATCH] musl: Use MUSL_LDSO_PATHS to generate lib search paths file
With this change, the OpenHarmomy lib paths are now added to
/etc/ld-musl-${MUSL_LDSO_ARCH}.path based on the content of the distro
variable MUSL_LDSO_PATHS.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
---
recipes-core/musl/musl_%.bbappend | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/recipes-core/musl/musl_%.bbappend b/recipes-core/musl/musl_%.bbappend
index cc05fd60..82812d40 100644
--- a/recipes-core/musl/musl_%.bbappend
+++ b/recipes-core/musl/musl_%.bbappend
@@ -25,20 +25,7 @@ LDFLAGS:append:toolchain-clang = " ${@bb.utils.contains('COMPILER_RT', '-rtlib=c
#CFLAGS:append:oniro-openharmony-linux = "-DHOOK_ENABLE"
do_install:append:oniro-openharmony-linux () {
- cat >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path << EOF
-${libdir}/module
-${libdir}/module/ability
-${libdir}/module/account
-${libdir}/module/app
-${libdir}/module/application
-${libdir}/module/bundle
-${libdir}/module/data
-${libdir}/module/distributedhardware
-${libdir}/module/events
-${libdir}/module/multimedia
-${libdir}/module/multimodalinput
-${libdir}/module/net
-${libdir}/module/security
-${libdir}/module/telephony
-EOF
+ for folder in ${MUSL_LDSO_PATHS}; do
+ echo "${libdir}/${folder}" >> ${D}${sysconfdir}/ld-musl-${MUSL_LDSO_ARCH}.path
+ done
}
--
GitLab