[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/

[James Le Cuirot]

commit:     24698e9d84c8effa7848893aed7e6a9aff569a1f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  5 10:51:46 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> 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 <chewi <AT> 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