* [PATCH 1/2] linuxloader.bbclass: Add entry for ppc64 LE glibc loader
@ 2021-06-16 19:39 Khem Raj
2021-06-16 19:39 ` [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-06-16 19:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/linuxloader.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass
index 1b64be6405..4447c8847c 100644
--- a/meta/classes/linuxloader.bbclass
+++ b/meta/classes/linuxloader.bbclass
@@ -40,6 +40,8 @@ def get_glibc_loader(d):
dynamic_loader = "${base_libdir}/ld-linux-mipsn8.so.1"
elif targetarch.startswith("mips"):
dynamic_loader = "${base_libdir}/ld.so.1"
+ elif targetarch == "powerpc64le":
+ dynamic_loader = "${base_libdir}/ld64.so.2"
elif targetarch == "powerpc64":
dynamic_loader = "${base_libdir}/ld64.so.1"
elif targetarch == "x86_64":
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations
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
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-06-16 19:39 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations
2021-06-14 22:01 [PATCH 1/2] linuxloader.bbclass: Add entry for ppc64 LE glibc loader Khem Raj
@ 2021-06-14 22:01 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2021-06-14 22:01 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-16 19:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-16 19:39 [PATCH 1/2] linuxloader.bbclass: Add entry for ppc64 LE glibc loader Khem Raj
2021-06-16 19:39 ` [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations Khem Raj
-- strict thread matches above, loose matches on Subject: below --
2021-06-14 22:01 [PATCH 1/2] linuxloader.bbclass: Add entry for ppc64 LE glibc loader Khem Raj
2021-06-14 22:01 ` [PATCH 2/2] gcompat: Create symlinks to glibc ldso locations Khem Raj
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.