summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-21 21:05:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-22 23:40:16 +0100
commitb1154d5fe7e75bb46132165b13ed76ce95413b25 (patch)
treea94235758692cb335cd2aeb5f4a30656c93e6ecf /meta/recipes-core
parent02fd8e760cac1d2e0e25a4e3dbea3f2844b9fd01 (diff)
downloadopenembedded-core-contrib-b1154d5fe7e75bb46132165b13ed76ce95413b25.tar.gz
gcompat: Fix build when usrmerge distro feature is enabled
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/musl/gcompat_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb
index 962bcd8c75..b051e43b6c 100644
--- a/meta/recipes-core/musl/gcompat_git.bb
+++ b/meta/recipes-core/musl/gcompat_git.bb
@@ -37,14 +37,14 @@ do_compile () {
}
do_install () {
- oe_runmake install 'DESTDIR=${D}'
+ oe_runmake install 'DESTDIR=${D}${root_prefix}'
if [ "${SITEINFO_BITS}" = "64" ]; then
- install -d ${D}/lib64
- ln -rs ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}`
+ install -d ${D}${nonarch_base_libdir}${SITEINFO_BITS}
+ ln -rs ${D}${GLIBC_LDSO} ${D}${nonarch_base_libdir}${SITEINFO_BITS}/`basename ${GLIBC_LDSO}`
fi
}
-FILES:${PN} += "/lib64"
+FILES:${PN} += "${nonarch_base_libdir}${SITEINFO_BITS}"
INSANE_SKIP:${PN} = "libdir"