Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] musl: fix ldd symlink for multilib systems.
@ 2020-12-27 19:51 ericonr
  2020-12-27 20:00 ` q66
  2020-12-27 20:00 ` [PR PATCH] [Merged]: " q66
  0 siblings, 2 replies; 3+ messages in thread
From: ericonr @ 2020-12-27 19:51 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: musl: fix ldd symlink for multilib systems.
  2020-12-27 19:51 [PR PATCH] musl: fix ldd symlink for multilib systems ericonr
@ 2020-12-27 20:00 ` q66
  2020-12-27 20:00 ` [PR PATCH] [Merged]: " q66
  1 sibling, 0 replies; 3+ messages in thread
From: q66 @ 2020-12-27 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 141 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27480#issuecomment-751509723

Comment:
lgtm

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: musl: fix ldd symlink for multilib systems.
  2020-12-27 19:51 [PR PATCH] musl: fix ldd symlink for multilib systems ericonr
  2020-12-27 20:00 ` q66
@ 2020-12-27 20:00 ` q66
  1 sibling, 0 replies; 3+ messages in thread
From: q66 @ 2020-12-27 20:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

There's a merged pull request on the void-packages repository

musl: fix ldd symlink for multilib systems.
https://github.com/void-linux/void-packages/pull/27480

Description:
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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-12-27 20:00 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-27 19:51 [PR PATCH] musl: fix ldd symlink for multilib systems ericonr
2020-12-27 20:00 ` q66
2020-12-27 20:00 ` [PR PATCH] [Merged]: " q66

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).