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 6FBDB15808E for ; Sat, 23 Apr 2022 02:10:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A19DEE0878; Sat, 23 Apr 2022 02:10:03 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3B41E0878 for ; Sat, 23 Apr 2022 02:10:01 +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 848B2341A99 for ; Sat, 23 Apr 2022 02:10:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E530E3BC for ; Sat, 23 Apr 2022 02:09:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650679666.a258229c73554b23d6eb0c60a0d4706f7d19dc32.sam@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.2-r7.ebuild sys-libs/musl/musl-1.2.2-r8.ebuild sys-libs/musl/musl-1.2.3.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a258229c73554b23d6eb0c60a0d4706f7d19dc32 X-VCS-Branch: master Date: Sat, 23 Apr 2022 02:09:58 +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: 30870ad8-a92b-44c4-824f-c8ef8a67b981 X-Archives-Hash: 4fb1efcf8d526fba55e5f8cccc1c23c2 commit: a258229c73554b23d6eb0c60a0d4706f7d19dc32 Author: Sam James gentoo org> AuthorDate: Sat Apr 23 02:07:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 23 02:07:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a258229c sys-libs/musl: fix ROOT check in pkg_postinst With EAPI 7+, ROOT and others will be blank (not /). Signed-off-by: Sam James gentoo.org> sys-libs/musl/musl-1.2.2-r7.ebuild | 2 +- sys-libs/musl/musl-1.2.2-r8.ebuild | 2 +- sys-libs/musl/musl-1.2.3.ebuild | 2 +- sys-libs/musl/musl-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-libs/musl/musl-1.2.2-r7.ebuild b/sys-libs/musl/musl-1.2.2-r7.ebuild index e03ad57480ff..de91db9af87b 100644 --- a/sys-libs/musl/musl-1.2.2-r7.ebuild +++ b/sys-libs/musl/musl-1.2.2-r7.ebuild @@ -161,7 +161,7 @@ src_install() { pkg_postinst() { is_crosscompile && return 0 - [ "${ROOT}" != "/" ] && return 0 + [ -n "${ROOT}" ] && return 0 ldconfig || die } diff --git a/sys-libs/musl/musl-1.2.2-r8.ebuild b/sys-libs/musl/musl-1.2.2-r8.ebuild index c83d3cbb6c04..ee20a7659de3 100644 --- a/sys-libs/musl/musl-1.2.2-r8.ebuild +++ b/sys-libs/musl/musl-1.2.2-r8.ebuild @@ -167,7 +167,7 @@ src_install() { pkg_postinst() { is_crosscompile && return 0 - [ "${ROOT}" != "/" ] && return 0 + [ -n "${ROOT}" ] && return 0 ldconfig || die } diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild index 26ac4bb3ec3b..07ab1388cef8 100644 --- a/sys-libs/musl/musl-1.2.3.ebuild +++ b/sys-libs/musl/musl-1.2.3.ebuild @@ -167,7 +167,7 @@ src_install() { pkg_postinst() { is_crosscompile && return 0 - [ "${ROOT}" != "/" ] && return 0 + [ -n "${ROOT}" ] && return 0 ldconfig || die } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 26ac4bb3ec3b..07ab1388cef8 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -167,7 +167,7 @@ src_install() { pkg_postinst() { is_crosscompile && return 0 - [ "${ROOT}" != "/" ] && return 0 + [ -n "${ROOT}" ] && return 0 ldconfig || die }