From: "Khem Raj" <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations
Date: Wed, 16 Jun 2021 12:39:49 -0700 [thread overview]
Message-ID: <20210616193949.1153981-2-raj.khem@gmail.com> (raw)
In-Reply-To: <20210616193949.1153981-1-raj.khem@gmail.com>
This ensures the glibc based binaries can find it in right place
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/gcompat_git.bb | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
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
--
2.32.0
next prev parent reply other threads:[~2021-06-16 19:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 19:39 [PATCH 1/2] linuxloader.bbclass: Add entry for ppc64 LE glibc loader Khem Raj
2021-06-16 19:39 ` Khem Raj [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-14 22:01 Khem Raj
2021-06-14 22:01 ` [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616193949.1153981-2-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.