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 6342815800F for ; Sun, 5 Feb 2023 19:08:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A83BE0843; Sun, 5 Feb 2023 19:08:10 +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 80209E0843 for ; Sun, 5 Feb 2023 19:08:10 +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 76E3F340B27 for ; Sun, 5 Feb 2023 19:08:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFE22896 for ; Sun, 5 Feb 2023 19:08:07 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1675624071.24698e9d84c8effa7848893aed7e6a9aff569a1f.chewi@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-r7.ebuild sys-libs/musl/musl-9999.ebuild X-VCS-Directories: sys-libs/musl/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 24698e9d84c8effa7848893aed7e6a9aff569a1f X-VCS-Branch: master Date: Sun, 5 Feb 2023 19:08:07 +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: 02b4d788-f477-47a0-a7a9-a0896b81a60f X-Archives-Hash: 64f24495e0884e6466439946e7748abb commit: 24698e9d84c8effa7848893aed7e6a9aff569a1f Author: James Le Cuirot gentoo org> AuthorDate: Sun Feb 5 10:51:46 2023 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Feb 5 19:07:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24698e9d sys-libs/musl: Create /etc/ld.so.conf.d directory like glibc does Given that musl has long added an `include` directive for this directory to ld.so.conf, we believe not creating the directory was an accidental omission. gcc-config has special code to handle the case where it doesn't exist, but eselect modules like blas do not, and subsequently break. I have tested this, and both gcc-config and eselect-blas now behave as expected. There is no migration to do. The tools simply start using the directory once it is available. Signed-off-by: James Le Cuirot gentoo.org> sys-libs/musl/{musl-9999.ebuild => musl-1.2.3-r7.ebuild} | 8 ++++++++ sys-libs/musl/musl-9999.ebuild | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.3-r7.ebuild similarity index 97% copy from sys-libs/musl/musl-9999.ebuild copy to sys-libs/musl/musl-1.2.3-r7.ebuild index 231c91cb5ce1..9cd55f813a6c 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-1.2.3-r7.ebuild @@ -191,6 +191,14 @@ src_install() { fi } +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d +} + pkg_postinst() { is_crosscompile && return 0 diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 231c91cb5ce1..9cd55f813a6c 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -191,6 +191,14 @@ src_install() { fi } +pkg_preinst() { + # nothing to do if just installing headers + just_headers && return + + # prepare /etc/ld.so.conf.d/ for files + mkdir -p "${EROOT}"/etc/ld.so.conf.d +} + pkg_postinst() { is_crosscompile && return 0