From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1708652-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 364BB15813A
for <garchives@archives.gentoo.org>; Sun, 12 Jan 2025 11:25:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 52EAAE07EF;
Sun, 12 Jan 2025 11:25:24 +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 22496E07EF
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 11:25:21 +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 3C81B335C11
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 11:25:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7ABDC1DD9
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jan 2025 11:25:18 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1736681046.b4e71be10e278d786d9f2f4dcb77c01360fc2cc8.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.3-r8.ebuild sys-libs/musl/musl-1.2.4-r1.ebuild sys-libs/musl/musl-1.2.4-r2.ebuild sys-libs/musl/musl-1.2.5-r1.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: b4e71be10e278d786d9f2f4dcb77c01360fc2cc8
X-VCS-Branch: master
Date: Sun, 12 Jan 2025 11:25:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5f97eeb4-18a4-44f3-aa1d-9d10f954c38a
X-Archives-Hash: 6dc1875cec45a3af1cc8fc35e7183a49
commit: b4e71be10e278d786d9f2f4dcb77c01360fc2cc8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:22:57 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:24:06 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e71be1
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 <sam <AT> gentoo.org>
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 a92b617b8fd1..1aadcaab94cf 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 2d9af6f92d44..581ac6ffe152 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 296f83982c96..8bfb46ffef59 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 beea27bbd243..7fe02741839d 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 278e5e367d77..5679adc85bec 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