Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/musl/
Date: Sun, 29 Nov 2015 02:06:33
Message-Id: 1448763206.6d844bdd8b581c94b98e55a1178664a8551a6cdb.blueness@gentoo
1 commit: 6d844bdd8b581c94b98e55a1178664a8551a6cdb
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 29 02:13:26 2015 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 29 02:13:26 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d844bdd
7
8 sys-libs/musl: remove older stable version.
9
10 Package-Manager: portage-2.2.20.1
11
12 sys-libs/musl/Manifest | 1 -
13 sys-libs/musl/musl-1.1.11-r1.ebuild | 129 ------------------------------------
14 2 files changed, 130 deletions(-)
15
16 diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
17 index d896113..a4d3803 100644
18 --- a/sys-libs/musl/Manifest
19 +++ b/sys-libs/musl/Manifest
20 @@ -1,2 +1 @@
21 -DIST musl-1.1.11.tar.gz 915244 SHA256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f SHA512 573131fe7a2c5a9c9bf796a5fc02e6ec093148648b9b43dc13d9c85e5777b1691499af6f673075a0d2b4b36c788b4dd7d72eb450c6ec3a586901bd410ee1ea6d WHIRLPOOL 17d5299b7554124ec49c2309f9385313cffe0f2126812bbcce87a142b2138153b5634579a33554edba6b76aab87f96ef2bb5dc0773cc9b930356b7da6e0b61fb
22 DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c
23
24 diff --git a/sys-libs/musl/musl-1.1.11-r1.ebuild b/sys-libs/musl/musl-1.1.11-r1.ebuild
25 deleted file mode 100644
26 index 018860e..0000000
27 --- a/sys-libs/musl/musl-1.1.11-r1.ebuild
28 +++ /dev/null
29 @@ -1,129 +0,0 @@
30 -# Copyright 1999-2015 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -# $Id$
33 -
34 -EAPI=5
35 -
36 -inherit eutils flag-o-matic multilib toolchain-funcs
37 -if [[ ${PV} == "9999" ]] ; then
38 - EGIT_REPO_URI="git://git.musl-libc.org/musl"
39 - inherit git-2
40 -fi
41 -
42 -export CBUILD=${CBUILD:-${CHOST}}
43 -export CTARGET=${CTARGET:-${CHOST}}
44 -if [[ ${CTARGET} == ${CHOST} ]] ; then
45 - if [[ ${CATEGORY} == cross-* ]] ; then
46 - export CTARGET=${CATEGORY#cross-}
47 - fi
48 -fi
49 -
50 -DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
51 -HOMEPAGE="http://www.musl-libc.org/"
52 -if [[ ${PV} != "9999" ]] ; then
53 - PATCH_VER=""
54 - SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
55 - KEYWORDS="-* amd64 arm ~mips ppc x86"
56 -fi
57 -
58 -LICENSE="MIT LGPL-2 GPL-2"
59 -SLOT="0"
60 -IUSE="crosscompile_opts_headers-only"
61 -
62 -RDEPEND="!sys-apps/getent"
63 -
64 -is_crosscompile() {
65 - [[ ${CHOST} != ${CTARGET} ]]
66 -}
67 -
68 -just_headers() {
69 - use crosscompile_opts_headers-only && is_crosscompile
70 -}
71 -
72 -musl_endian() {
73 - # XXX: this wont work for bi-endian, but we dont have any
74 - touch "${T}"/endian.s
75 - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
76 - case $(file "${T}"/endian.o) in
77 - *" MSB "*) echo "";;
78 - *" LSB "*) echo "el";;
79 - *) echo "nfc";; # We shouldn't be here
80 - esac
81 -}
82 -
83 -pkg_setup() {
84 - if [ ${CTARGET} == ${CHOST} ] ; then
85 - case ${CHOST} in
86 - *-musl*) ;;
87 - *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
88 - esac
89 - fi
90 -}
91 -
92 -src_prepare() {
93 - epatch "${FILESDIR}"/${P}-fix-codeset.patch
94 - epatch_user
95 -}
96 -
97 -src_configure() {
98 - tc-getCC ${CTARGET}
99 - just_headers && export CC=true
100 -
101 - local sysroot
102 - is_crosscompile && sysroot=/usr/${CTARGET}
103 - ./configure \
104 - --target=${CTARGET} \
105 - --prefix=${sysroot}/usr \
106 - --syslibdir=${sysroot}/lib \
107 - --disable-gcc-wrapper
108 -}
109 -
110 -src_compile() {
111 - emake include/bits/alltypes.h || die
112 - just_headers && return 0
113 -
114 - emake || die
115 -}
116 -
117 -src_install() {
118 - local target="install"
119 - just_headers && target="install-headers"
120 - emake DESTDIR="${D}" ${target} || die
121 - just_headers && return 0
122 -
123 - # musl provides ldd via a sym link to its ld.so
124 - local sysroot
125 - is_crosscompile && sysroot=/usr/${CTARGET}
126 - local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
127 - dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
128 -
129 - if [[ ${CATEGORY} != cross-* ]] ; then
130 - local target=$(tc-arch) arch
131 - local endian=$(musl_endian)
132 - case ${target} in
133 - amd64) arch="x86_64";;
134 - arm) arch="armhf";; # We only have hardfloat right now
135 - mips) arch="mips${endian}";;
136 - ppc) arch="powerpc";;
137 - x86) arch="i386";;
138 - esac
139 - cp "${FILESDIR}"/ldconfig.in "${T}"
140 - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig
141 - into /
142 - dosbin "${T}"/ldconfig
143 - into /usr
144 - dobin "${FILESDIR}"/getent
145 - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
146 - doenvd "${T}"/00musl || die
147 - fi
148 -}
149 -
150 -pkg_postinst() {
151 - is_crosscompile && return 0
152 -
153 - [ "${ROOT}" != "/" ] && return 0
154 -
155 - ldconfig
156 - # reload init ...
157 - /sbin/telinit U 2>/dev/null
158 -}