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 51DC415800C for ; Mon, 3 Apr 2023 19:06:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 989FCE08FA; Mon, 3 Apr 2023 19:06:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 7A71DE08FA for ; Mon, 3 Apr 2023 19:06:52 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73301340A7B 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 37A318BC 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: <1680548780.6de834d0aba32a86de1aee8806f8c03a815ad98e.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: 6de834d0aba32a86de1aee8806f8c03a815ad98e 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: 13a04a5c-9c3e-43e5-bc5c-85cd418b39b8 X-Archives-Hash: f334bfdf56abda12da9e79c0ea71ae6f commit: 6de834d0aba32a86de1aee8806f8c03a815ad98e Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 3 18:13:02 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 3 19:06:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de834d0 sys-libs/musl: fix ld-musl.so symlink with merged-usr To create a symlink relative to /lib/ld-musl.so, we must know if ${ROOT} will have /lib symlinked to /usr/lib. We rely on the split-usr USE flag to determine this. Closes: https://bugs.gentoo.org/903703 Signed-off-by: Mike Gilbert gentoo.org> .../musl/{musl-9999.ebuild => musl-1.2.3-r8.ebuild} | 18 +++++++++++------- sys-libs/musl/musl-9999.ebuild | 18 +++++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild similarity index 92% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.2.3-r8.ebuild index 9cd55f813a6c..cc84710e0176 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.2.3-r8.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eapi8-dosym flag-o-matic toolchain-funcs prefix +inherit flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -38,7 +38,7 @@ HOMEPAGE="https://musl.libc.org" LICENSE="MIT LGPL-2 GPL-2" SLOT="0" -IUSE="crypt headers-only" +IUSE="crypt headers-only split-usr" QA_SONAME="usr/lib/libc.so" QA_DT_NEEDED="usr/lib/libc.so" @@ -164,11 +164,15 @@ src_install() { # During cross or within prefix, there's no guarantee that the host is # using musl so that file may not exist. Use a relative symlink within # ${D} instead. - rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die - dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1 - - # If it's still a dead symlnk, OK, we really do need to abort. - [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + rm "${ED}"/lib/ld-musl-${arch}.so.1 || die + if use split-usr; then + dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + else + dosym libc.so /usr/lib/ld-musl-${arch}.so.1 + [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die + fi cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 9cd55f813a6c..cc84710e0176 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eapi8-dosym flag-o-matic toolchain-funcs prefix +inherit flag-o-matic toolchain-funcs prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.musl-libc.org/musl" inherit git-r3 @@ -38,7 +38,7 @@ HOMEPAGE="https://musl.libc.org" LICENSE="MIT LGPL-2 GPL-2" SLOT="0" -IUSE="crypt headers-only" +IUSE="crypt headers-only split-usr" QA_SONAME="usr/lib/libc.so" QA_DT_NEEDED="usr/lib/libc.so" @@ -164,11 +164,15 @@ src_install() { # During cross or within prefix, there's no guarantee that the host is # using musl so that file may not exist. Use a relative symlink within # ${D} instead. - rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die - dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1 - - # If it's still a dead symlnk, OK, we really do need to abort. - [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + rm "${ED}"/lib/ld-musl-${arch}.so.1 || die + if use split-usr; then + dosym ../usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + else + dosym libc.so /usr/lib/ld-musl-${arch}.so.1 + [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die + fi cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die