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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
Date: Fri,  1 Mar 2024 07:55:40 +0000 (UTC)	[thread overview]
Message-ID: <1709279678.e23653d8401aaf3ce11dbc7aa799c92077068bde.sam@gentoo> (raw)

commit:     e23653d8401aaf3ce11dbc7aa799c92077068bde
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 05:10:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 07:54:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23653d8

sys-libs/musl: add 1.2.5

Unkeyworded for testing.

While at it, some minor style tweaks.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/musl/Manifest                             |  2 ++
 .../musl/{musl-9999.ebuild => musl-1.2.5.ebuild}   | 26 ++++++++++++----------
 sys-libs/musl/musl-9999.ebuild                     | 24 +++++++++++---------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index b6ee312fa2ae..db22821f8a4a 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,4 +4,6 @@ DIST musl-1.2.3.tar.gz 1058642 BLAKE2B b7f667eeb6b9f612c086cb44e69b34da4361b8cb7
 DIST musl-1.2.3.tar.gz.asc 490 BLAKE2B 4de3d2b2f4e748795b71e144df3ac073c68b0b1b5d40c7a4c3507cc3700c1f47a4ec745f644fa78d82de4cd1915b80be7ac1071fdfd6d468e01361c49ded065d SHA512 01a857dbc3981c90244d4d1d883efe51986652ca5734a741c9d1a4d06c5a22831e85520ac67212268b70c22049317a8f39b3219be182e7e67741add428ac5bc6
 DIST musl-1.2.4.tar.gz 1063758 BLAKE2B 7b5c5e335c55248789bca26084a744152f1128dd39159bcf46456ce1a4438c50097c75c7b84aa2980dccf2156f45de41e446ee39c7b3a43d80592c2b9ce75d98 SHA512 498ec5d7941194a8806f4d42f0f6d218c862996ef1398b737d0d06995e0b7a6574b240a48088f6b84016b14b2776fe463f829dcb11149cdfc1023d496b235c55
 DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd118012bddf0880d444fdfa456c6b448681838fcf3effa5403fd1bfbef7274cac548fecca3ec2f2e4e217ef74409 SHA512 5a3362ef1e60ae021a2c56ecde202a9dfd71914f3631ab498c8b751c38b217010997c8b28e31ebb6d1a8fb2663165a35943615825e2c220eb48ce66908ea1a9e
+DIST musl-1.2.5.tar.gz 1080786 BLAKE2B 6065dc1e01874d1b96abe714147dcc0b41ca702ca9e9c44e85864185dab0b6d085a692745db0822c94a79325e1a91dad60c52f467717d9323b2b3c6ad0a17545 SHA512 7bb7f7833923cd69c7a1a9b8a5f1784bfd5289663eb6061dcd43d583e45987df8a68a1be05d75cc1c88a3f5b610653d1a70f4a9cff4d8f7fd41ae73ee058c17c
+DIST musl-1.2.5.tar.gz.asc 490 BLAKE2B f0d91b20aa7729449bd02a60adf17e8287904ed5971851a34b15f500011137ddc3f338d24712ff0481f1d6f9a749d87014a82b26a3bd9de660ddbf29678a8777 SHA512 c8aebf05b14abbd33ff568ca17ddd8b29e6f53cbb1cb85e00b64f15516ffc46a7a064c996a7bb1c9681a361a4921204ac58e4a1cfd7bd3ad60d7f2b0151d9229
 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-1.2.5.ebuild
similarity index 90%
copy from sys-libs/musl/musl-9999.ebuild
copy to sys-libs/musl/musl-1.2.5.ebuild
index 6034c89cca3e..77268ed11b5a 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-1.2.5.ebuild
@@ -4,7 +4,11 @@
 EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
+
+DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
@@ -13,10 +17,11 @@ else
 
 	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
+	#KEYWORDS="-* ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
 fi
+
 GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
 GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
 SRC_URI+="
@@ -25,9 +30,6 @@ SRC_URI+="
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 "
 
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
 IUSE="crypt headers-only split-usr"
@@ -55,12 +57,12 @@ just_headers() {
 pkg_setup() {
 	if [ ${CTARGET} == ${CHOST} ] ; then
 		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+			*-musl*) ;;
+			*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
 		esac
 	fi
 
-	# fix for #667126, copied from glibc ebuild
+	# Fix for bug #667126, copied from glibc ebuild:
 	# make sure host make.conf doesn't pollute us
 	if target_is_not_host || tc-is-cross-compiler ; then
 		CHOST=${CTARGET} strip-unsupported-flags
@@ -118,7 +120,7 @@ src_compile() {
 			VPATH="${WORKDIR}/misc"
 	fi
 
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
 	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
 }
 
@@ -184,17 +186,17 @@ src_install() {
 }
 
 pkg_preinst() {
-	# nothing to do if just installing headers
+	# Nothing to do if just installing headers
 	just_headers && return
 
-	# prepare /etc/ld.so.conf.d/ for files
+	# Prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${EROOT}"/etc/ld.so.conf.d
 }
 
 pkg_postinst() {
 	target_is_not_host && return 0
 
-	[ -n "${ROOT}" ] && return 0
+	[[ -n "${ROOT}" ]] && return 0
 
 	ldconfig || die
 }

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 6034c89cca3e..6f769c7aa732 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -4,7 +4,11 @@
 EAPI=8
 
 inherit crossdev flag-o-matic toolchain-funcs prefix
-if [[ ${PV} == "9999" ]] ; then
+
+DESCRIPTION="Light, fast and, simple C library focused on standards-conformance and safety"
+HOMEPAGE="https://musl.libc.org"
+
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.musl-libc.org/git/musl"
 	inherit git-r3
 else
@@ -17,6 +21,7 @@ else
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
 fi
+
 GETENT_COMMIT="93a08815f8598db442d8b766b463d0150ed8e2ab"
 GETENT_FILE="musl-getent-${GETENT_COMMIT}.c"
 SRC_URI+="
@@ -25,9 +30,6 @@ SRC_URI+="
 	https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 "
 
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
-HOMEPAGE="https://musl.libc.org"
-
 LICENSE="MIT LGPL-2 GPL-2"
 SLOT="0"
 IUSE="crypt headers-only split-usr"
@@ -55,12 +57,12 @@ just_headers() {
 pkg_setup() {
 	if [ ${CTARGET} == ${CHOST} ] ; then
 		case ${CHOST} in
-		*-musl*) ;;
-		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+			*-musl*) ;;
+			*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
 		esac
 	fi
 
-	# fix for #667126, copied from glibc ebuild
+	# Fix for bug #667126, copied from glibc ebuild:
 	# make sure host make.conf doesn't pollute us
 	if target_is_not_host || tc-is-cross-compiler ; then
 		CHOST=${CTARGET} strip-unsupported-flags
@@ -118,7 +120,7 @@ src_compile() {
 			VPATH="${WORKDIR}/misc"
 	fi
 
-	$(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o  "${FILESDIR}"/stack_chk_fail_local.c || die
+	$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die
 	$(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die
 }
 
@@ -184,17 +186,17 @@ src_install() {
 }
 
 pkg_preinst() {
-	# nothing to do if just installing headers
+	# Nothing to do if just installing headers
 	just_headers && return
 
-	# prepare /etc/ld.so.conf.d/ for files
+	# Prepare /etc/ld.so.conf.d/ for files
 	mkdir -p "${EROOT}"/etc/ld.so.conf.d
 }
 
 pkg_postinst() {
 	target_is_not_host && return 0
 
-	[ -n "${ROOT}" ] && return 0
+	[[ -n "${ROOT}" ]] && return 0
 
 	ldconfig || die
 }

next             reply	other threads:[~2024-03-01  7:55 UTC|newest]

Thread overview: 203+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-01  7:55 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-14 22:24 [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/ Sam James
2025-02-15 17:36 Petr Vaněk
2025-02-15 15:19 Arthur Zamarin
2025-02-15 15:19 Arthur Zamarin
2025-02-15 15:19 Arthur Zamarin
2025-02-15 15:19 Arthur Zamarin
2025-02-15 15:19 Arthur Zamarin
2025-02-15 15:19 Arthur Zamarin
2025-02-14 18:15 Arthur Zamarin
2025-02-14 18:15 Arthur Zamarin
2025-02-14 18:13 Arthur Zamarin
2025-02-14 18:13 Arthur Zamarin
2025-02-14 18:13 Arthur Zamarin
2025-02-14 18:13 Arthur Zamarin
2025-02-14  5:29 Sam James
2025-02-14  5:29 Sam James
2025-02-14  5:29 Sam James
2025-02-14  5:29 Sam James
2025-02-14  5:29 Sam James
2025-02-13 18:18 Petr Vaněk
2025-02-13 18:18 Petr Vaněk
2025-02-13 17:58 Petr Vaněk
2025-02-04 17:13 Sam James
2025-01-12 11:25 Sam James
2025-01-03 10:51 Sam James
2025-01-03 10:51 Sam James
2025-01-03 10:51 Sam James
2025-01-03 10:51 Sam James
2025-01-03 10:51 Sam James
2025-01-03 10:51 Sam James
2024-12-31 17:18 Sam James
2024-12-31 15:40 Sam James
2024-07-08  3:38 Sam James
2024-07-08  3:38 Sam James
2024-07-08  3:38 Sam James
2024-07-08  3:38 Sam James
2024-05-02  7:31 Andreas K. Hüttel
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-07 17:45 Sam James
2024-03-04 10:24 Sam James
2024-01-01  2:20 Sam James
2023-12-30  6:59 Arthur Zamarin
2023-12-30  6:59 Arthur Zamarin
2023-12-30  6:59 Arthur Zamarin
2023-12-30  6:59 Arthur Zamarin
2023-12-30  6:59 Arthur Zamarin
2023-12-30  6:59 Arthur Zamarin
2023-12-28  3:53 Sam James
2023-12-28  3:53 Sam James
2023-12-17 11:45 Sam James
2023-08-22 18:04 Sam James
2023-05-09 11:38 Sam James
2023-05-02 19:11 Sam James
2023-04-03 19:06 Mike Gilbert
2023-04-03 19:06 Mike Gilbert
2023-04-03 19:06 Mike Gilbert
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-03-31 11:59 Arthur Zamarin
2023-02-15  9:56 Sam James
2023-02-05 19:08 James Le Cuirot
2023-01-29  8:45 Sam James
2023-01-15 22:41 Sam James
2022-12-29 19:01 Sam James
2022-11-08  1:30 Sam James
2022-10-17 20:31 Sam James
2022-09-23  1:56 Sam James
2022-09-23  1:56 Sam James
2022-09-19 15:50 Sam James
2022-09-13 23:46 Sam James
2022-09-12 17:18 Sam James
2022-09-11 17:27 Sam James
2022-09-10 11:28 Sam James
2022-08-06 14:57 Jory Pratt
2022-07-18 16:03 Sam James
2022-07-18 16:03 Sam James
2022-06-22 23:12 Sam James
2022-04-23  2:09 Sam James
2022-04-15 16:39 Arthur Zamarin
2022-04-12  7:15 Sam James
2022-04-07 22:38 Sam James
2022-04-07 20:55 Sam James
2022-04-07 20:55 Sam James
2022-02-26 17:32 Andreas K. Hüttel
2022-02-10  4:12 Sam James
2021-12-01 21:57 Anthony G. Basile
2021-11-19  3:05 Sam James
2021-11-18  0:48 Sam James
2021-11-18  0:02 Sam James
2021-11-16  2:59 Sam James
2021-11-15  7:19 Sam James
2021-11-10  3:39 Sam James
2021-11-10  3:32 Sam James
2021-08-16  0:59 Jory Pratt
2021-06-06  9:31 Sergei Trofimovich
2021-04-24 12:37 Sergei Trofimovich
2021-04-03 11:52 Anthony G. Basile
2021-02-16 20:09 Jory Pratt
2021-02-15  0:32 Sam James
2021-02-14 17:09 Jory Pratt
2021-01-21 15:43 Mike Gilbert
2021-01-20 18:02 Mike Gilbert
2021-01-20  9:09 Sergei Trofimovich
2021-01-19 21:56 Anthony G. Basile
2021-01-03 18:58 Fabian Groffen
2020-12-06 21:21 Anthony G. Basile
2020-11-30 14:21 Anthony G. Basile
2020-11-30  0:06 Anthony G. Basile
2020-11-27 20:57 Anthony G. Basile
2020-08-20 13:15 Anthony G. Basile
2020-08-06 14:38 Anthony G. Basile
2020-05-25  9:22 Sergei Trofimovich
2020-05-20 22:12 Jory Pratt
2020-03-03  1:45 Anthony G. Basile
2020-02-26  3:24 Jory Pratt
2020-02-02 13:04 Sergei Trofimovich
2020-01-30  2:06 Anthony G. Basile
2020-01-30  2:06 Anthony G. Basile
2020-01-05 19:56 Anthony G. Basile
2020-01-05 19:23 Anthony G. Basile
2019-11-22 17:17 Anthony G. Basile
2019-11-17 16:58 Anthony G. Basile
2019-11-10  1:30 Anthony G. Basile
2019-10-14 13:57 Jory Pratt
2019-09-08 20:41 Anthony G. Basile
2019-09-07 14:26 Anthony G. Basile
2019-09-03 14:40 Anthony G. Basile
2019-09-03 11:18 Anthony G. Basile
2019-09-03 11:18 Anthony G. Basile
2019-09-03 11:18 Anthony G. Basile
2019-07-18 17:23 Anthony G. Basile
2019-05-12 23:47 Anthony G. Basile
2019-04-28 19:44 Anthony G. Basile
2019-04-14 15:43 Anthony G. Basile
2019-04-10 19:53 Anthony G. Basile
2019-04-06 20:15 Anthony G. Basile
2019-03-31 14:57 Anthony G. Basile
2019-02-02 17:28 Sergei Trofimovich
2019-01-27 16:13 Anthony G. Basile
2019-01-27 15:59 Anthony G. Basile
2019-01-27 12:44 Anthony G. Basile
2019-01-27 12:44 Anthony G. Basile
2018-12-31 18:26 Anthony G. Basile
2018-10-04 21:39 Anthony G. Basile
2018-09-13 18:56 Anthony G. Basile
2018-09-13  2:24 Anthony G. Basile
2018-09-12 21:28 Anthony G. Basile
2018-08-02 23:31 Anthony G. Basile
2018-08-02 23:13 Anthony G. Basile
2018-08-02 23:13 Anthony G. Basile
2018-03-04  0:37 Anthony G. Basile
2018-02-23 16:08 Anthony G. Basile
2018-01-07 19:39 Sergei Trofimovich
2018-01-01  9:59 Anthony G. Basile
2017-12-29 18:22 Sergei Trofimovich
2017-11-27 14:46 Anthony G. Basile
2017-11-27 14:46 Anthony G. Basile
2017-11-12 13:51 Anthony G. Basile
2017-11-02  1:07 Anthony G. Basile
2017-11-02  1:07 Anthony G. Basile
2017-10-31 20:39 Anthony G. Basile
2017-10-31 20:35 Anthony G. Basile
2017-10-20 23:38 Anthony G. Basile
2017-09-06 21:00 Michał Górny
2017-04-23  1:07 Anthony G. Basile
2017-01-08 23:00 Anthony G. Basile
2017-01-01 16:57 Anthony G. Basile
2016-10-23  9:11 Anthony G. Basile
2016-10-20  3:49 Anthony G. Basile
2016-10-20  3:49 Anthony G. Basile
2016-09-24 20:15 Anthony G. Basile
2016-09-24 13:51 Anthony G. Basile
2016-09-20  9:19 Anthony G. Basile
2016-07-06 23:42 Anthony G. Basile
2016-06-05  8:02 Anthony G. Basile
2016-06-05  0:39 Anthony G. Basile
2016-06-05  0:35 Anthony G. Basile
2016-02-22 11:52 Anthony G. Basile
2016-02-22  8:50 Anthony G. Basile
2016-02-20 18:52 Anthony G. Basile
2016-02-17  4:42 Anthony G. Basile
2016-02-17  0:51 Anthony G. Basile
2016-02-17  0:48 Anthony G. Basile
2015-11-29  2:06 Anthony G. Basile
2015-10-25 14:52 Anthony G. Basile
2015-10-22 11:07 Anthony G. Basile
2015-10-21 19:40 Anthony G. Basile
2015-10-21 19:37 Anthony G. Basile
2015-10-21 19:33 Anthony G. Basile
2015-10-21  1:21 Anthony G. Basile
2015-09-08 22:15 Anthony G. Basile
2015-08-31  3:02 Anthony G. Basile
2015-08-30 14:37 Anthony G. Basile
2015-08-09  9:23 Anthony G. Basile
2015-08-09  9:18 Anthony G. Basile

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b6ee312fa2a dfblob:db22821f8a4 dfblob:6034c89cca3
dfblob:77268ed11b5 dfblob:6034c89cca3 dfblob:6f769c7aa73 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1709279678.e23653d8401aaf3ce11dbc7aa799c92077068bde.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox