From 4da1e8091ea0a57209519f0a4755d06aa108f439 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 16 Jun 2021 12:39:49 -0700 Subject: gcompat: Create symlinks to glibc ldso locations This ensures the glibc based binaries can find it in right place (From OE-Core rev: 5d82adcbc2326d8abc0039388578d730906b3e58) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/musl/gcompat_git.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/musl/gcompat_git.bb b/meta/recipes-core/musl/gcompat_git.bb index e1ae052c44..863ba8dbf0 100644 --- a/meta/recipes-core/musl/gcompat_git.bb +++ b/meta/recipes-core/musl/gcompat_git.bb @@ -14,14 +14,16 @@ SRCREV = "af5a49e489fdc04b9cf02547650d7aeaccd43793" S = "${WORKDIR}/git" -inherit pkgconfig linuxloader +inherit pkgconfig linuxloader siteinfo DEPENDS += "musl-obstack" GLIBC_LDSO = "${@get_glibc_loader(d)}" MUSL_LDSO = "${@get_musl_loader(d)}" -EXTRA_OEMAKE = "LINKER_PATH=${MUSL_LDSO} LOADER_NAME=`basename ${@get_glibc_loader(d)}`" +EXTRA_OEMAKE = "LINKER_PATH=${MUSL_LDSO} \ + LOADER_NAME=`basename ${GLIBC_LDSO}` \ + " do_configure () { : @@ -33,8 +35,16 @@ do_compile () { do_install () { oe_runmake install 'DESTDIR=${D}' + if [ "${SITEINFO_BITS}" = "64" ]; then + install -d ${D}/lib64 + lnr ${D}${GLIBC_LDSO} ${D}/lib64/`basename ${GLIBC_LDSO}` + fi } +FILES_${PN} += "/lib64" + +INSANE_SKIP_${PN} = "libdir" + RPROVIDES_${PN} += "musl-glibc-compat" # # We will skip parsing for non-musl systems -- cgit v1.2.3-54-g00ecf