From b4e71be10e278d786d9f2f4dcb77c01360fc2cc8 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 12 Jan 2025 11:22:57 +0000 Subject: [PATCH] sys-libs/musl: add warning to /etc/env.d/00musl env-update relies on this entry (which populates LDPATH) to look in /etc/ld.so.conf.d/* which is needed to find GCC libraries. Add a header reading the following: > 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. Prompted by a case on IRC where a user overwrote the file when following a wiki page, see: * https://wiki.gentoo.org/index.php?title=Musl_usage_guide&diff=1310555&oldid=1303905 * https://wiki.gentoo.org/index.php?title=Musl_usage_guide&diff=1331398&oldid=1310555 * https://wiki.gentoo.org/index.php?title=Musl_usage_guide&diff=1331399&oldid=1331398 Signed-off-by: Sam James --- sys-libs/musl/musl-1.2.3-r8.ebuild | 8 +++++--- sys-libs/musl/musl-1.2.4-r1.ebuild | 8 +++++--- sys-libs/musl/musl-1.2.4-r2.ebuild | 8 +++++--- sys-libs/musl/musl-1.2.5-r1.ebuild | 6 ++++-- sys-libs/musl/musl-9999.ebuild | 8 +++++--- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sys-libs/musl/musl-1.2.3-r8.ebuild b/sys-libs/musl/musl-1.2.3-r8.ebuild index a92b617b8fd11..1aadcaab94cf6 100644 --- a/sys-libs/musl/musl-1.2.3-r8.ebuild +++ b/sys-libs/musl/musl-1.2.3-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -183,8 +183,10 @@ src_install() { dobin "${T}"/getconf dobin "${T}"/getent dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF fi if is_crosscompile ; then diff --git a/sys-libs/musl/musl-1.2.4-r1.ebuild b/sys-libs/musl/musl-1.2.4-r1.ebuild index 2d9af6f92d442..581ac6ffe152b 100644 --- a/sys-libs/musl/musl-1.2.4-r1.ebuild +++ b/sys-libs/musl/musl-1.2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -175,8 +175,10 @@ src_install() { dobin "${T}"/getconf dobin "${T}"/getent dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF fi if target_is_not_host ; then diff --git a/sys-libs/musl/musl-1.2.4-r2.ebuild b/sys-libs/musl/musl-1.2.4-r2.ebuild index 296f83982c96c..8bfb46ffef59b 100644 --- a/sys-libs/musl/musl-1.2.4-r2.ebuild +++ b/sys-libs/musl/musl-1.2.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -176,8 +176,10 @@ src_install() { dobin "${T}"/getconf dobin "${T}"/getent dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF fi if target_is_not_host ; then diff --git a/sys-libs/musl/musl-1.2.5-r1.ebuild b/sys-libs/musl/musl-1.2.5-r1.ebuild index beea27bbd2432..7fe02741839d4 100644 --- a/sys-libs/musl/musl-1.2.5-r1.ebuild +++ b/sys-libs/musl/musl-1.2.5-r1.ebuild @@ -177,8 +177,10 @@ src_install() { dobin "${T}"/getconf dobin "${T}"/getent dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF fi if target_is_not_host ; then diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 278e5e367d771..5679adc85beca 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -173,8 +173,10 @@ src_install() { dobin "${T}"/getconf dobin "${T}"/getent dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl + newenvd - "00musl" <<-EOF + # 00musl autogenerated by sys-libs/musl ebuild; DO NOT EDIT. + LDPATH="include ld.so.conf.d/*.conf" + EOF fi if target_is_not_host ; then