diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2015-10-21 15:26:34 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2015-10-21 15:26:59 -0400 |
commit | 25b0aefa56557cbb4fc6e1e17b9776f9611cfeb6 (patch) | |
tree | c63fbc55ac5a9066a26ba1a4dc62f3454fd94f0a /sys-libs/musl | |
parent | dev-db/mariadb: Version bump to 10.1.8 GA (diff) | |
download | gentoo-25b0aefa56557cbb4fc6e1e17b9776f9611cfeb6.tar.gz gentoo-25b0aefa56557cbb4fc6e1e17b9776f9611cfeb6.tar.bz2 gentoo-25b0aefa56557cbb4fc6e1e17b9776f9611cfeb6.zip |
sys-libs/musl: remove older stable versions.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sys-libs/musl')
-rw-r--r-- | sys-libs/musl/Manifest | 1 | ||||
-rw-r--r-- | sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff | 25 | ||||
-rw-r--r-- | sys-libs/musl/musl-1.1.10-r1.ebuild | 129 | ||||
-rw-r--r-- | sys-libs/musl/musl-1.1.11.ebuild | 128 |
4 files changed, 0 insertions, 283 deletions
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest index 86e2f737276f..d8961135065a 100644 --- a/sys-libs/musl/Manifest +++ b/sys-libs/musl/Manifest @@ -1,3 +1,2 @@ -DIST musl-1.1.10.tar.gz 907181 SHA256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c SHA512 183a66a8cc9cd056a8387a1602dd44b502d8976642a21dd0dcef51165fa0dec8a4a124fda6c1918f402b20ad2d6037fcc188a8b174b07a0cbedf11fc2e011141 WHIRLPOOL b69737c22a77da0ff59886d8233b9b1d43228e75bfdf857a5a74ab26f4699564c5b54390bcf171a4f4d9c8fc211f4c6e9c6d4dd6802cc01a5dfe5369bbdd8158 DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c diff --git a/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff b/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff deleted file mode 100644 index 2785195dc0d0..000000000000 --- a/sys-libs/musl/files/musl-1.1.10-uselocale-0-fix.diff +++ /dev/null @@ -1,25 +0,0 @@ ->From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001 -From: Timo Teräs <timo.teras@iki.fi> -Date: Fri, 05 Jun 2015 07:39:42 +0000 -Subject: fix uselocale((locale_t)0) not to modify locale - -commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to -be assigned unconditonally resulting in crashes later on. ---- -diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c -index b70a0c1..0fc5ecb 100644 ---- a/src/locale/uselocale.c -+++ b/src/locale/uselocale.c -@@ -8,9 +8,7 @@ locale_t __uselocale(locale_t new) - locale_t old = self->locale; - locale_t global = &libc.global_locale; - -- if (new == LC_GLOBAL_LOCALE) new = global; -- -- self->locale = new; -+ if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new; - - return old == global ? LC_GLOBAL_LOCALE : old; - } --- -cgit v0.9.0.3-65-g4555 diff --git a/sys-libs/musl/musl-1.1.10-r1.ebuild b/sys-libs/musl/musl-1.1.10-r1.ebuild deleted file mode 100644 index d6830e228e37..000000000000 --- a/sys-libs/musl/musl-1.1.10-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.musl-libc.org/musl" - inherit git-2 -fi - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety" -HOMEPAGE="http://www.musl-libc.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" - KEYWORDS="-* amd64 arm ~mips ppc x86" -fi - -LICENSE="MIT LGPL-2 GPL-2" -SLOT="0" -IUSE="crosscompile_opts_headers-only" - -RDEPEND="!sys-apps/getent" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -just_headers() { - use crosscompile_opts_headers-only && is_crosscompile -} - -musl_endian() { - # XXX: this wont work for bi-endian, but we dont have any - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "";; - *" LSB "*) echo "el";; - *) echo "nfc";; # We shouldn't be here - esac -} - -pkg_setup() { - if [ ${CTARGET} == ${CHOST} ] ; then - case ${CHOST} in - *-musl*) ;; - *) die "Use sys-devel/crossdev to build a musl toolchain" ;; - esac - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-uselocale-0-fix.diff - epatch_user -} - -src_configure() { - tc-getCC ${CTARGET} - just_headers && export CC=true - - local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} - ./configure \ - --target=${CTARGET} \ - --prefix=${sysroot}/usr \ - --syslibdir=${sysroot}/lib \ - --disable-gcc-wrapper -} - -src_compile() { - emake include/bits/alltypes.h || die - just_headers && return 0 - - emake || die -} - -src_install() { - local target="install" - just_headers && target="install-headers" - emake DESTDIR="${D}" ${target} || die - 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 "${D}"${sysroot}/lib/ld-musl-*) - dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd - - if [[ ${CATEGORY} != cross-* ]] ; then - local target=$(tc-arch) arch - local endian=$(musl_endian) - case ${target} in - amd64) arch="x86_64";; - arm) arch="armhf";; # We only have hardfloat right now - mips) arch="mips${endian}";; - ppc) arch="powerpc";; - x86) arch="i386";; - esac - cp "${FILESDIR}"/ldconfig.in "${T}" - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig - into / - dosbin "${T}"/ldconfig - into /usr - dobin "${FILESDIR}"/getent - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl - doenvd "${T}"/00musl || die - fi -} - -pkg_postinst() { - is_crosscompile && return 0 - - [ "${ROOT}" != "/" ] && return 0 - - ldconfig - # reload init ... - /sbin/telinit U 2>/dev/null -} diff --git a/sys-libs/musl/musl-1.1.11.ebuild b/sys-libs/musl/musl-1.1.11.ebuild deleted file mode 100644 index 8fe6febc5a5a..000000000000 --- a/sys-libs/musl/musl-1.1.11.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.musl-libc.org/musl" - inherit git-2 -fi - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety" -HOMEPAGE="http://www.musl-libc.org/" -if [[ ${PV} != "9999" ]] ; then - PATCH_VER="" - SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz" - KEYWORDS="-* amd64 arm ~mips ppc x86" -fi - -LICENSE="MIT LGPL-2 GPL-2" -SLOT="0" -IUSE="crosscompile_opts_headers-only" - -RDEPEND="!sys-apps/getent" - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -just_headers() { - use crosscompile_opts_headers-only && is_crosscompile -} - -musl_endian() { - # XXX: this wont work for bi-endian, but we dont have any - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "";; - *" LSB "*) echo "el";; - *) echo "nfc";; # We shouldn't be here - esac -} - -pkg_setup() { - if [ ${CTARGET} == ${CHOST} ] ; then - case ${CHOST} in - *-musl*) ;; - *) die "Use sys-devel/crossdev to build a musl toolchain" ;; - esac - fi -} - -src_prepare() { - epatch_user -} - -src_configure() { - tc-getCC ${CTARGET} - just_headers && export CC=true - - local sysroot - is_crosscompile && sysroot=/usr/${CTARGET} - ./configure \ - --target=${CTARGET} \ - --prefix=${sysroot}/usr \ - --syslibdir=${sysroot}/lib \ - --disable-gcc-wrapper -} - -src_compile() { - emake include/bits/alltypes.h || die - just_headers && return 0 - - emake || die -} - -src_install() { - local target="install" - just_headers && target="install-headers" - emake DESTDIR="${D}" ${target} || die - 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 "${D}"${sysroot}/lib/ld-musl-*) - dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd - - if [[ ${CATEGORY} != cross-* ]] ; then - local target=$(tc-arch) arch - local endian=$(musl_endian) - case ${target} in - amd64) arch="x86_64";; - arm) arch="armhf";; # We only have hardfloat right now - mips) arch="mips${endian}";; - ppc) arch="powerpc";; - x86) arch="i386";; - esac - cp "${FILESDIR}"/ldconfig.in "${T}" - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig - into / - dosbin "${T}"/ldconfig - into /usr - dobin "${FILESDIR}"/getent - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl - doenvd "${T}"/00musl || die - fi -} - -pkg_postinst() { - is_crosscompile && return 0 - - [ "${ROOT}" != "/" ] && return 0 - - ldconfig - # reload init ... - /sbin/telinit U 2>/dev/null -} |