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 F23A5158086 for ; Mon, 22 Nov 2021 12:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9420E08EF; Mon, 22 Nov 2021 12:18:49 +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 0F1B9E08F1 for ; Mon, 22 Nov 2021 12:18:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 99F153432F2 for ; Mon, 22 Nov 2021 12:18:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1F4D8E for ; Mon, 22 Nov 2021 12:18:44 +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: <1637582329.d9a66f3d2030eb59c117cb96296d7a617d757fc1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/, sys-libs/musl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/musl/files/ldconfig.in-r1 sys-libs/musl/musl-1.2.2-r5.ebuild sys-libs/musl/musl-1.2.2-r6.ebuild X-VCS-Directories: sys-libs/musl/files/ sys-libs/musl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d9a66f3d2030eb59c117cb96296d7a617d757fc1 X-VCS-Branch: master Date: Mon, 22 Nov 2021 12:18:44 +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: 539c261e-e5e1-4640-8675-6376f5060444 X-Archives-Hash: 1b5fbf484ddee508624b3245c31baaa2 commit: d9a66f3d2030eb59c117cb96296d7a617d757fc1 Author: Kofi Hannam tuta io> AuthorDate: Mon Nov 22 11:58:15 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 22 11:58:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a66f3d sys-libs/musl: exit early in ldconfig if nothing has changed This fixes an access violation when compiling sys-libs/ncurses and /usr/bin/ld is not ld.bfd. Closes: https://bugs.gentoo.org/719330 Closes: https://github.com/gentoo/gentoo/pull/21939 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Kofi Hannam tuta.io> Signed-off-by: Sam James gentoo.org> sys-libs/musl/files/ldconfig.in-r1 | 8 ++++++++ sys-libs/musl/{musl-1.2.2-r5.ebuild => musl-1.2.2-r6.ebuild} | 0 2 files changed, 8 insertions(+) diff --git a/sys-libs/musl/files/ldconfig.in-r1 b/sys-libs/musl/files/ldconfig.in-r1 index 1b565baf9eed..7bf254dfd91c 100644 --- a/sys-libs/musl/files/ldconfig.in-r1 +++ b/sys-libs/musl/files/ldconfig.in-r1 @@ -116,6 +116,13 @@ sanitize() { echo ${drs} } +changed() { + [[ -f ${ETC_LDSO_PATH} ]] || return 0 + local current=$(<${ETC_LDSO_PATH}) + current=${current//$'\n'/ } + [[ ${current} != ${drs} ]] || return 1 +} + get_options "$@" if [[ ! -e ${LDSO_CONF} ]]; then @@ -139,6 +146,7 @@ LDSO_ARCH=$(basename ${LDSO_PATH}) LDSO_NAME=${LDSO_ARCH%.so.1} ETC_LDSO_PATH="${ROOT}/etc/${LDSO_NAME}.path" +changed || exit 0 X=$(mktemp -p /tmp ${LDSO_NAME}.XXXXXX) for d in ${drs}; do echo ${d} >> ${X} diff --git a/sys-libs/musl/musl-1.2.2-r5.ebuild b/sys-libs/musl/musl-1.2.2-r6.ebuild similarity index 100% rename from sys-libs/musl/musl-1.2.2-r5.ebuild rename to sys-libs/musl/musl-1.2.2-r6.ebuild