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
}
