From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] musl: fix ldd symlink for multilib systems.
Date: Sun, 27 Dec 2020 20:51:42 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27480@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages musl-ldd
https://github.com/void-linux/void-packages/pull/27480
musl: fix ldd symlink for multilib systems.
Also allows it to be called in any situation, not only when
/usr/lib/libc.so is indeed musl.
Not increasing revision, since this isn't an urgent fix.
@q66
A patch file from https://github.com/void-linux/void-packages/pull/27480.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-musl-ldd-27480.patch --]
[-- Type: text/x-diff, Size: 886 bytes --]
From d84af72c033c15e4f89df0548959994bf6dd74c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 26 Dec 2020 23:50:40 -0300
Subject: [PATCH] musl: fix ldd symlink for multilib systems.
Also allows it to be called in any situation, not only when
/usr/lib/libc.so is indeed musl.
Not increasing revision, since this isn't an urgent fix.
---
srcpkgs/musl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index a08ef9e0d89..a6a49ff3d05 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -32,7 +32,7 @@ do_install() {
rm ${DESTDIR}/lib
# provide ldd
vmkdir usr/bin
- ln -s /usr/lib/libc.so ${DESTDIR}/usr/bin/ldd
+ ln -s ../lib${XBPS_TARGET_WORDSIZE}/libc.so ${DESTDIR}/usr/bin/ldd
# additional utils from Alpine/NetBSD
vbin iconv
vbin getent
next reply other threads:[~2020-12-27 19:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-27 19:51 ericonr [this message]
2020-12-27 20:00 ` q66
2020-12-27 20:00 ` [PR PATCH] [Merged]: " q66
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27480@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).