glibc: Adapt do_install_append_aarch64() for usrmerge

Change hardcoded /lib to ${nonarch_base_libdir} to correctly adapt the
code in do_install_append_aarch64() for when usrmerge is enabled in
DISTRO_FEATURES.

(From OE-Core rev: ac373c9f760463d989d6a1eb3a14b7c5b255b9d4)

(From OE-Core rev: 1c121dcf930b0b2e9f5c6e79715864a753a2d34b)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index df3db2cc45..b6d80745cc 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -113,15 +113,15 @@ do_install_append () {
 }
 
 do_install_append_aarch64 () {
-        if [ "${base_libdir}" != "/lib" ] ; then
+        if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then
                 # The aarch64 ABI says the dynamic linker -must- be /lib/ld-linux-aarch64[_be].so.1
-                install -d ${D}/lib
+                install -d ${D}${nonarch_base_libdir}
                 if [ -e ${D}${base_libdir}/ld-linux-aarch64.so.1 ]; then
-                        ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64.so.1 \
-                                ${D}/lib/ld-linux-aarch64.so.1
+                        ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64.so.1 \
+                                ${D}${nonarch_base_libdir}/ld-linux-aarch64.so.1
                 elif [ -e ${D}${base_libdir}/ld-linux-aarch64_be.so.1 ]; then
-                        ln -s ${@base_path_relative('/lib', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
-                                ${D}/lib/ld-linux-aarch64_be.so.1
+                        ln -s ${@base_path_relative('${nonarch_base_libdir}', '${base_libdir}')}/ld-linux-aarch64_be.so.1 \
+                                ${D}${nonarch_base_libdir}/ld-linux-aarch64_be.so.1
                 fi
         fi
         do_install_armmultilib