From 721254b86a09bdedd5eefd0de7899c90ea2ead1a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jan 2018 20:42:22 +0000 Subject: gentoo resync : 01.01.2018 --- sys-libs/musl/Manifest | 3 +- sys-libs/musl/musl-1.1.18-r1.ebuild | 118 ------------------------------------ sys-libs/musl/musl-9999.ebuild | 4 +- 3 files changed, 3 insertions(+), 122 deletions(-) delete mode 100644 sys-libs/musl/musl-1.1.18-r1.ebuild (limited to 'sys-libs/musl') diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index 11ba284cda17..285478f008b7 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -3,7 +3,6 @@ DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c -EBUILD musl-1.1.18-r1.ebuild 3099 BLAKE2B 9276b448d12043734ca17d60b731747868813976676ee6ad30cc818cbe50e3b4cd862c901ddeaf07f77957d61dd24f24977aeb1407e7621c60f31a16fab93cc7 SHA512 f6b766d6157eb4415dd8faebeb93f71e0d127d71396380b1372f5d324c32b85c23673d922d9e700c4154d92a06d6262a5cf2e95ecbd641360ff37679b430daa4 EBUILD musl-1.1.18.ebuild 3082 BLAKE2B ffc41a796597676ecddae84376909dca5cb96555a71edaa2d4e44ba20427f31cc1819ee8eb7b7cdcfc6721552019cb944bf93e25e07f54c021b8f58c9e44af7b SHA512 4e1d2fe1a2484b8af7d94388212aea5343591df09633e9382b5d389fc7695e2e38215f14b29fe98c027bb244a8ca8c8c798aa020701eab6d1a0a21e425efaddf -EBUILD musl-9999.ebuild 3099 BLAKE2B 9276b448d12043734ca17d60b731747868813976676ee6ad30cc818cbe50e3b4cd862c901ddeaf07f77957d61dd24f24977aeb1407e7621c60f31a16fab93cc7 SHA512 f6b766d6157eb4415dd8faebeb93f71e0d127d71396380b1372f5d324c32b85c23673d922d9e700c4154d92a06d6262a5cf2e95ecbd641360ff37679b430daa4 +EBUILD musl-9999.ebuild 3086 BLAKE2B fc772d8b5b84f2baa5fd727b85856e2c912f2b9076241c55b314b9c1dd382f827b38535c1911f317a96c563cf9e968eb48b9833667bb7a06c45d57d5c5e2dc64 SHA512 ca447c747b0e4e3a124323f2dfc2a91cbafa2613784f2e7814ea856a97232c0140352403189663d2dfaf3cbf32a72f3b6760b96e09ef572c73d1d31c333d9874 MISC metadata.xml 452 BLAKE2B f6d26f456e1a1005b0103c6921d59504dcacddfaf9ec3c788f6f626df670ec7e979a8a66626d7de24d0b850651bf095610c191d520b67915a701bf8564189fc4 SHA512 676d8122179a5cb56e0b9c7aeb7f0aec8c19b5d7b604a19c9ee01aeca837a74cc4284e87cc743d0eaf527f0c79afdfeb1f238c204a8a6c1c5590b2718bbc9b03 diff --git a/sys-libs/musl/musl-1.1.18-r1.ebuild b/sys-libs/musl/musl-1.1.18-r1.ebuild deleted file mode 100644 index c4a1c90aaf5a..000000000000 --- a/sys-libs/musl/musl-1.1.18-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.musl-libc.org/musl" - inherit git-r3 - SRC_URI=" - https://dev.gentoo.org/~blueness/musl-misc/getconf.c - https://dev.gentoo.org/~blueness/musl-misc/getent.c - https://dev.gentoo.org/~blueness/musl-misc/iconv.c" - KEYWORDS="" -else - SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz - https://dev.gentoo.org/~blueness/musl-misc/getconf.c - https://dev.gentoo.org/~blueness/musl-misc/getent.c - https://dev.gentoo.org/~blueness/musl-misc/iconv.c" - KEYWORDS="-* ~amd64 ~arm ~mips ~ppc ~x86" -fi - -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="http://www.musl-libc.org/" -LICENSE="MIT LGPL-2 GPL-2" -SLOT="0" -IUSE="crosscompile_opts_headers-only" - -QA_SONAME="/usr/lib/libc.so" -QA_DT_NEEDED="/usr/lib/libc.so" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -just_headers() { - use crosscompile_opts_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 -} - -src_configure() { - tc-getCC ${CTARGET} - just_headers && export CC=true - - local sysroot - is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} - ./configure \ - --target=${CTARGET} \ - --prefix=${sysroot}/usr \ - --syslibdir=${sysroot}/lib \ - --disable-gcc-wrapper || die -} - -src_compile() { - emake obj/include/bits/alltypes.h - just_headers && return 0 - - emake - if [[ ${CATEGORY} != cross-* ]] ; then - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die - fi -} - -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 ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd - - if [[ ${CATEGORY} != cross-* ]] ; then - local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') - [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die - cp "${FILESDIR}"/ldconfig.in "${T}" || die - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die - 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 || die - fi -} - -pkg_postinst() { - is_crosscompile && return 0 - - [ "${ROOT}" != "/" ] && return 0 - - ldconfig || die - # reload init ... - /sbin/telinit U 2>/dev/null -} diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index c4a1c90aaf5a..9e0e184d6562 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -59,7 +59,7 @@ src_configure() { just_headers && export CC=true local sysroot - is_crosscompile && sysroot="${EPREFIX}"/usr/${CTARGET} + is_crosscompile && sysroot=/usr/${CTARGET} ./configure \ --target=${CTARGET} \ --prefix=${sysroot}/usr \ @@ -88,7 +88,7 @@ src_install() { # 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-*) + local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd if [[ ${CATEGORY} != cross-* ]] ; then -- cgit v1.2.3