From 4ae4e74a3a13c7c5aaebf61e650538b005204fcb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Sep 2022 23:22:40 +0100 Subject: gentoo auto-resync : 19:09:2022 - 23:22:40 --- sys-libs/Manifest.gz | Bin 14243 -> 14236 bytes sys-libs/musl/Manifest | 4 +- sys-libs/musl/musl-1.2.3-r3.ebuild | 194 ------------------------------------ sys-libs/musl/musl-1.2.3-r4.ebuild | 195 +++++++++++++++++++++++++++++++++++++ sys-libs/musl/musl-9999.ebuild | 3 +- 5 files changed, 199 insertions(+), 197 deletions(-) delete mode 100644 sys-libs/musl/musl-1.2.3-r3.ebuild create mode 100644 sys-libs/musl/musl-1.2.3-r4.ebuild (limited to 'sys-libs') diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz index aa74e0a6ddf4..83765cecb03a 100644 Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index 73a689146ff9..8378466a01d0 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -8,7 +8,7 @@ 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-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee EBUILD musl-1.2.2-r8.ebuild 4761 BLAKE2B 6ba61072504bdbef329aaafa0e6c86f5420dc3340bd5949ccfc1ddf7961b0b3b8648a8b881cc3d585de028fc9ec4a92515f5a1fe7d66e039179d89a06dfa3718 SHA512 62c88c3ca65c4b954d82ad57b28535c2d80cf0d3bb670ebfca0af5503ab9e34ab2023defbf57591d1a4a40e2a6954e38eadf0cb458e22b94a9689bed7348ca08 -EBUILD musl-1.2.3-r3.ebuild 5391 BLAKE2B d187b58208c36949df99639898fb8477252739d83493b59a80ce08ad6c99ba7219a3e34c60b216ca4ca570af49600cb5e9693046460ed2de65bf83e5c8ba0678 SHA512 ff9d697eeb07c043c03296099d7c6fd37a92e7754bf079b0a7f17cf9b5b6672b0b25363f307019670edb20423bd72727fdaa013e809f125e3106a1cc7ddd2836 +EBUILD musl-1.2.3-r4.ebuild 5440 BLAKE2B 91f227cabc6ec8ff8831c6e2bf17cd20e458808996506484ee7de17a13303cd7fb388247d5a57932ec60a78d4eb73aa03853fddd550ff5019654f1063380569c SHA512 d86a09a27e1953ff2515fde8d5ef760926fe86e591edfc6271290ec7c8f3573af98abff84cf413dcf9879438680892f41a02c714e8d9d893c5b6819823a9ab3e EBUILD musl-1.2.3.ebuild 4763 BLAKE2B 4768ada4a94d0c3763e71137187b4c2e715026994e3133cd424807a30d4cd11d63af819550a6bf446e24d15048bfef54f06ff1a6783726d4ef6502fced8dcc79 SHA512 2e072dd2dabd362184d027c62317ac45d2b58da84d77d933559673ff430769124b53da5580c210d584fe56be943853085c00adf3e3733fbf762a4864f1d5fa17 -EBUILD musl-9999.ebuild 5391 BLAKE2B d187b58208c36949df99639898fb8477252739d83493b59a80ce08ad6c99ba7219a3e34c60b216ca4ca570af49600cb5e9693046460ed2de65bf83e5c8ba0678 SHA512 ff9d697eeb07c043c03296099d7c6fd37a92e7754bf079b0a7f17cf9b5b6672b0b25363f307019670edb20423bd72727fdaa013e809f125e3106a1cc7ddd2836 +EBUILD musl-9999.ebuild 5440 BLAKE2B 91f227cabc6ec8ff8831c6e2bf17cd20e458808996506484ee7de17a13303cd7fb388247d5a57932ec60a78d4eb73aa03853fddd550ff5019654f1063380569c SHA512 d86a09a27e1953ff2515fde8d5ef760926fe86e591edfc6271290ec7c8f3573af98abff84cf413dcf9879438680892f41a02c714e8d9d893c5b6819823a9ab3e MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92 diff --git a/sys-libs/musl/musl-1.2.3-r3.ebuild b/sys-libs/musl/musl-1.2.3-r3.ebuild deleted file mode 100644 index 215d34d742fa..000000000000 --- a/sys-libs/musl/musl-1.2.3-r3.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eapi8-dosym flag-o-matic toolchain-funcs prefix -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.musl-libc.org/musl" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc - inherit verify-sig - - 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 ~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+=" - https://dev.gentoo.org/~blueness/musl-misc/getconf.c - https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} - https://dev.gentoo.org/~blueness/musl-misc/iconv.c -" - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -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" - -QA_SONAME="usr/lib/libc.so" -QA_DT_NEEDED="usr/lib/libc.so" -# bug #830213 -QA_PRESTRIPPED="usr/lib/crtn.o" - -# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) -# built as part as crossdev. Also, elide the blockers when in cross-*, -# as it doesn't make sense to block the normal CBUILD libxcrypt at all -# there when we're installing into /usr/${CHOST} anyway. -if [[ ${CATEGORY} == cross-* ]] ; then - IUSE="${IUSE/crypt/+crypt}" -else - RDEPEND=" - crypt? ( !sys-libs/libxcrypt[system] ) - !crypt? ( sys-libs/libxcrypt[system] ) - " -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -just_headers() { - use headers-only && is_crosscompile -} - -pkg_setup() { - if [ ${CTARGET} == ${CHOST} ] ; then - case ${CHOST} in - *-musl*) ;; - *) die "Use sys-devel/crossdev to build a musl toolchain" ;; - esac - fi - - # fix for #667126, copied from glibc ebuild - # make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - elif use verify-sig ; then - # We only verify the release; not the additional (fixed, safe) files - # we download. - # (Seem to get IPC error on verifying in cross?) - ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} - fi - - default -} - -src_prepare() { - default - - mkdir "${WORKDIR}"/misc || die - cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die - cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die - cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die -} - -src_configure() { - tc-getCC ${CTARGET} - - just_headers && export CC=true - - local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} - ./configure \ - --target=${CTARGET} \ - --prefix=${EPREFIX}${sysroot}/usr \ - --syslibdir=${EPREFIX}${sysroot}/lib \ - --disable-gcc-wrapper || die -} - -src_compile() { - emake obj/include/bits/alltypes.h - just_headers && return 0 - - emake - if [[ ${CATEGORY} != cross-* ]] ; then - emake -C "${T}" getconf getent iconv \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - VPATH="${WORKDIR}/misc" - fi - - $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die - $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die -} - -src_install() { - local target="install" - just_headers && target="install-headers" - emake DESTDIR="${D}" ${target} - just_headers && return 0 - - # musl provides ldd via a sym link to its ld.so - local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) - dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd - - if ! use crypt ; then - # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die - fi - - if [[ ${CATEGORY} != cross-* ]] ; then - # Fish out of config: - # ARCH = ... - # SUBARCH = ... - # and print $(ARCH)$(SUBARCH). - local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) - - # The musl build system seems to create a symlink: - # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) - # During cross or within prefix, there's no guarantee that the host is - # using musl so that file may not exist. Use a relative symlink within - # ${D} instead. - rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die - dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1 - - # If it's still a dead symlnk, OK, we really do need to abort. - [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die - - cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die - eprefixify "${T}"/ldconfig - into / - dosbin "${T}"/ldconfig - into /usr - dobin "${T}"/getconf - dobin "${T}"/getent - dobin "${T}"/iconv - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl - dolib.a libssp_nonshared.a - fi -} - -pkg_postinst() { - is_crosscompile && return 0 - - [ -n "${ROOT}" ] && return 0 - - ldconfig || die -} diff --git a/sys-libs/musl/musl-1.2.3-r4.ebuild b/sys-libs/musl/musl-1.2.3-r4.ebuild new file mode 100644 index 000000000000..1d60464d46a4 --- /dev/null +++ b/sys-libs/musl/musl-1.2.3-r4.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eapi8-dosym flag-o-matic toolchain-funcs prefix +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.musl-libc.org/musl" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/musl.asc + inherit verify-sig + + 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 ~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+=" + https://dev.gentoo.org/~blueness/musl-misc/getconf.c + https://gitlab.alpinelinux.org/alpine/aports/-/raw/${GETENT_COMMIT}/main/musl/getent.c -> ${GETENT_FILE} + https://dev.gentoo.org/~blueness/musl-misc/iconv.c +" + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} +if [[ ${CTARGET} == ${CHOST} ]] ; then + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} + fi +fi + +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" + +QA_SONAME="usr/lib/libc.so" +QA_DT_NEEDED="usr/lib/libc.so" +# bug #830213 +QA_PRESTRIPPED="usr/lib/crtn.o" + +# We want crypt on by default for this as sys-libs/libxcrypt isn't (yet?) +# built as part as crossdev. Also, elide the blockers when in cross-*, +# as it doesn't make sense to block the normal CBUILD libxcrypt at all +# there when we're installing into /usr/${CHOST} anyway. +if [[ ${CATEGORY} == cross-* ]] ; then + IUSE="${IUSE/crypt/+crypt}" +else + RDEPEND=" + crypt? ( !sys-libs/libxcrypt[system] ) + !crypt? ( sys-libs/libxcrypt[system] ) + " +fi + +is_crosscompile() { + [[ ${CHOST} != ${CTARGET} ]] +} + +just_headers() { + use headers-only && is_crosscompile +} + +pkg_setup() { + if [ ${CTARGET} == ${CHOST} ] ; then + case ${CHOST} in + *-musl*) ;; + *) die "Use sys-devel/crossdev to build a musl toolchain" ;; + esac + fi + + # fix for #667126, copied from glibc ebuild + # make sure host make.conf doesn't pollute us + if is_crosscompile || tc-is-cross-compiler ; then + CHOST=${CTARGET} strip-unsupported-flags + fi +} + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # We only verify the release; not the additional (fixed, safe) files + # we download. + # (Seem to get IPC error on verifying in cross?) + ! is_crosscompile && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + +src_prepare() { + default + + mkdir "${WORKDIR}"/misc || die + cp "${DISTDIR}"/getconf.c "${WORKDIR}"/misc/getconf.c || die + cp "${DISTDIR}/${GETENT_FILE}" "${WORKDIR}"/misc/getent.c || die + cp "${DISTDIR}"/iconv.c "${WORKDIR}"/misc/iconv.c || die +} + +src_configure() { + tc-getCC ${CTARGET} + + just_headers && export CC=true + + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + ./configure \ + --target=${CTARGET} \ + --prefix=${EPREFIX}${sysroot}/usr \ + --syslibdir=${EPREFIX}${sysroot}/lib \ + --disable-gcc-wrapper || die +} + +src_compile() { + emake obj/include/bits/alltypes.h + just_headers && return 0 + + emake + if [[ ${CATEGORY} != cross-* ]] ; then + emake -C "${T}" getconf getent iconv \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + VPATH="${WORKDIR}/misc" + fi + + $(tc-getCC) ${CFLAGS} -c -o libssp_nonshared.o "${FILESDIR}"/stack_chk_fail_local.c || die + $(tc-getAR) -rcs libssp_nonshared.a libssp_nonshared.o || die +} + +src_install() { + local target="install" + just_headers && target="install-headers" + emake DESTDIR="${D}" ${target} + just_headers && return 0 + + # musl provides ldd via a sym link to its ld.so + local sysroot + is_crosscompile && sysroot=/usr/${CTARGET} + local ldso=$(basename "${ED}"${sysroot}/lib/ld-musl-*) + dosym ${EPREFIX}${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd + + if ! use crypt ; then + # Allow sys-libs/libxcrypt[system] to provide it instead + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die + fi + + if [[ ${CATEGORY} != cross-* ]] ; then + # Fish out of config: + # ARCH = ... + # SUBARCH = ... + # and print $(ARCH)$(SUBARCH). + local arch=$(awk '{ k[$1] = $3 } END { printf("%s%s", k["ARCH"], k["SUBARCH"]); }' config.mak) + + # The musl build system seems to create a symlink: + # ${D}/lib/ld-musl-${arch}.so.1 -> /usr/lib/libc.so.1 (absolute) + # During cross or within prefix, there's no guarantee that the host is + # using musl so that file may not exist. Use a relative symlink within + # ${D} instead. + rm -f "${ED}"/lib/ld-musl-${arch}.so.1 || die + dosym8 -r /usr/lib/libc.so /lib/ld-musl-${arch}.so.1 + + # If it's still a dead symlnk, OK, we really do need to abort. + [[ -e "${ED}"/lib/ld-musl-${arch}.so.1 ]] || die + + cp "${FILESDIR}"/ldconfig.in-r3 "${T}"/ldconfig.in || die + sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die + eprefixify "${T}"/ldconfig + into / + dosbin "${T}"/ldconfig + into /usr + dobin "${T}"/getconf + dobin "${T}"/getent + dobin "${T}"/iconv + echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die + doenvd "${T}"/00musl + dolib.a libssp_nonshared.a + fi +} + +pkg_postinst() { + is_crosscompile && 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 215d34d742fa..1d60464d46a4 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -149,7 +149,8 @@ src_install() { if ! use crypt ; then # Allow sys-libs/libxcrypt[system] to provide it instead - rm "${ED}"/usr/include/crypt.h || die + rm "${ED}/usr/include/crypt.h" || die + rm "${ED}/usr/$(get_libdir)/libcrypt.a" || die fi if [[ ${CATEGORY} != cross-* ]] ; then -- cgit v1.2.3