From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECB8415800C for ; Mon, 3 Apr 2023 19:06:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 108FEE08F9; Mon, 3 Apr 2023 19:06:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF7E4E08F9 for ; Mon, 3 Apr 2023 19:06:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10E28340A5D for ; Mon, 3 Apr 2023 19:06:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F8CFA1B for ; Mon, 3 Apr 2023 19:06:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1680548783.e0b7d24e4ede3433e7216c70ac6872a92d990ec3.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/musl-1.2.3-r8.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e0b7d24e4ede3433e7216c70ac6872a92d990ec3 X-VCS-Branch: master Date: Mon, 3 Apr 2023 19:06:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8bc27e07-c18e-4547-b44f-e37f9f34817b X-Archives-Hash: bc078ddee364bade9e2dfd208f1a58a5 commit: e0b7d24e4ede3433e7216c70ac6872a92d990ec3 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 3 18:48:11 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 3 19:06:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b7d24e sys-libs/musl: use dosym8 -r for /usr/bin/ldd symlink Signed-off-by: Mike Gilbert gentoo.org> sys-libs/musl/musl-1.2.3-r8.ebuild | 8 ++++---- sys-libs/musl/musl-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild index 4073f5c246b7..9d815eafd4f6 100644 --- a/sys-libs/musl/musl-1.2.3-r8.ebuild +++ b/sys-libs/musl/musl-1.2.3-r8.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs prefix +inherit eapi8-dosym flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -141,10 +141,10 @@ src_install() { just_headers && return 0 # musl provides ldd via a sym link to its ld.so - local sysroot + local sysroot= is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) - dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 4073f5c246b7..9d815eafd4f6 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs prefix +inherit eapi8-dosym flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -141,10 +141,10 @@ src_install() { just_headers && return 0 # musl provides ldd via a sym link to its ld.so - local sysroot + local sysroot= is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) - dosym "${EPREFIX}${sysroot}/lib/${ldso}" ${sysroot}/usr/bin/ldd + local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) + dosym8 -r "${sysroot}/lib/${ldso}" "${sysroot}/usr/bin/ldd" if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead