From d46d1d3a5897cade51811b3848c7bf27969da625 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2023 07:37:55 +0000 Subject: gentoo auto-resync : 28:12:2023 - 07:37:55 --- sys-libs/musl/Manifest | 2 - sys-libs/musl/musl-1.2.3.ebuild | 174 ---------------------------------- sys-libs/musl/musl-1.2.4.ebuild | 200 ---------------------------------------- 3 files changed, 376 deletions(-) delete mode 100644 sys-libs/musl/musl-1.2.3.ebuild delete mode 100644 sys-libs/musl/musl-1.2.4.ebuild (limited to 'sys-libs/musl') diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index ada74ce9a325..484cd2fb5ff8 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -10,8 +10,6 @@ DIST musl-1.2.4.tar.gz.asc 490 BLAKE2B 2133cff9ae2c8f69213fb72a256533d0686fd1180 DIST musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c 11656 BLAKE2B 1b7bf7102a1eb91a8cb881ed8ca65eb8eed911dd50238e97dc2952d89d4c6ebed6bfd046a2b38776c550b2872ab54ced8cb452fcc2ad56e5616f722debda761f SHA512 7f5b9d934d82deb5f8b23e16169a5d9b99ccab3a4708df06a95d685e1b24a3a3e69b3dcf4942f2f66c12a3d4bf0c5827e2ee2e8c4d7b1997359fccc2ac212dee EBUILD musl-1.2.3-r7.ebuild 5783 BLAKE2B 70a576de93379765eb5741ea555eeb0290290533014f79ce9a65ae3d73c12ab2c62196d0a00735c2fdd9130074a1d5674bee17b8342df611a4086ae54e2ef089 SHA512 458bbfeb64d14e2c46beeb89f02c8772fa2c9102307bd481d98ff80f245d58ee35bef133b5d6584df6798427ee0f3dd8ec0501dbddc44b0e1afb620173918eb3 EBUILD musl-1.2.3-r8.ebuild 5939 BLAKE2B db7a02bc65484de181f8a389ed3d635979018f45fd2f241cfdccb295b90a728f7a95341945a548e4aa3c3ff66620a9ca99c595fdd4050dc75b2b8b9c734ad4db SHA512 5e9251dbda73e0dd0e0a71b4cbd35058dae961f0cabe4d555d95c622dd6856b22e6bf18ec6ca61d6e275c2fdd0afa3450d80c7d8c8a95ad92b95507b3ba6017c -EBUILD musl-1.2.3.ebuild 4850 BLAKE2B 72d5aad92adf02b3e6f459e5533ce810923e05303092d199870b4fc12f49665f774ef2b962449f8d095677737886c4f7406679654e5761c52453984dc69779d7 SHA512 9fe67cc4443473e95c93879a84f0d44c32b00b7c1b108eb68ef96ce021fc7ab1f075e9a1b1822cb7218d3a00c0e01a8afdd23c2854b5d98f714727630858c2e3 EBUILD musl-1.2.4-r1.ebuild 5728 BLAKE2B 5dd5ff3e8374159ea39c8d3bae7d0070a105add736c4b73dfd3c2f769ec6e1d1c75df60d4ff7b6c2c38bb7308b2fb1c53eee33ce747d401a16d9ebf1348ca9af SHA512 21f9438c28de8a552ed5aa0d71385f75dbb905031234b17ffca30af8291403b21afe203c4d6b7c711a2cfc49337339c7cd20b23cc8c51f731088bed6dd807ee4 -EBUILD musl-1.2.4.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b EBUILD musl-9999.ebuild 5669 BLAKE2B cfd2e685efd786a4d9ca498ae798a08662ce6b30f361d1f7ed3833119dcde882456945c08c74875cdbeaa18c6729637522bca0696dc68a851e32881277b4e218 SHA512 89408896f640abda25f2ac468954f37231ecc0256d226a40b2886a02dbb04e43d67e39d5b409935fce519587eef65088309fde05399a642b00b05cbabc73fd7b MISC metadata.xml 559 BLAKE2B 8b1093a5278f716b8e21467b325e373a790f54c8ab71b92adc4c87dd569a92b20e08009372065f0f27ced39e3361c9e5e5a2e1bff271753d280439fabbddd3a4 SHA512 a35c13ea32ac8f26984bdb0d70d28a4285f34e32a2b0b17ad98fe3f357fb46c87a1e853377630d4da58fd5953de3fdeb02ee89181394e1815f5e0bbba4cd9f92 diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild deleted file mode 100644 index 850138951e5e..000000000000 --- a/sys-libs/musl/musl-1.2.3.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2023 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="https://git.musl-libc.org/git/musl" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/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="headers-only" - -QA_SONAME="/usr/lib/libc.so" -QA_DT_NEEDED="/usr/lib/libc.so" - -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() { - strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343 - 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 [[ ${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.4.ebuild b/sys-libs/musl/musl-1.2.4.ebuild deleted file mode 100644 index 2908fbd17541..000000000000 --- a/sys-libs/musl/musl-1.2.4.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit crossdev flag-o-matic toolchain-funcs prefix -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://git.musl-libc.org/git/musl" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/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 ~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+=" - 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 -" - -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" - -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 is_crosspkg ; then - IUSE="${IUSE/crypt/+crypt}" -else - RDEPEND="crypt? ( !sys-libs/libxcrypt[system] )" - PDEPEND="!crypt? ( sys-libs/libxcrypt[system] )" -fi - -just_headers() { - use headers-only && target_is_not_host -} - -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 target_is_not_host || 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?) - ! target_is_not_host && 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() { - strip-flags && filter-lto # Prevent issues caused by aggressive optimizations & bug #877343 - tc-getCC ${CTARGET} - - just_headers && export CC=true - - local sysroot - target_is_not_host && 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 ! is_crosspkg ; 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= - target_is_not_host && sysroot=/usr/${CTARGET} - local ldso=$(basename "${ED}${sysroot}"/lib/ld-musl-*) - dosym -r "${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 ! is_crosspkg ; 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 "${ED}"/lib/ld-musl-${arch}.so.1 || die - if use split-usr; then - dosym ../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 - else - dosym libc.so /usr/lib/ld-musl-${arch}.so.1 - [[ -e "${ED}"/usr/lib/ld-musl-${arch}.so.1 ]] || die - fi - - 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 - fi - - if target_is_not_host ; then - into /usr/${CTARGET} - dolib.a libssp_nonshared.a - else - dolib.a libssp_nonshared.a - fi -} - -pkg_preinst() { - # nothing to do if just installing headers - just_headers && return - - # 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 - - ldconfig || die -} -- cgit v1.2.3