1 |
commit: e37f8c29efb2985083adc34feb62bab4ff3323d3 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 20 19:01:05 2016 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 20 19:01:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e37f8c29 |
7 |
|
8 |
sys-libs/musl: version 1.1.13 has a serious regression |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
sys-libs/musl/Manifest | 1 - |
13 |
sys-libs/musl/musl-1.1.13.ebuild | 131 --------------------------------------- |
14 |
2 files changed, 132 deletions(-) |
15 |
|
16 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
17 |
index 6b764e3..a4d3803 100644 |
18 |
--- a/sys-libs/musl/Manifest |
19 |
+++ b/sys-libs/musl/Manifest |
20 |
@@ -1,2 +1 @@ |
21 |
DIST musl-1.1.12.tar.gz 918757 SHA256 720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e SHA512 7cabbe2665e32bd3408c8865f89f474106e982b4e5de81d0cdeea19e19e20b4d2496faf1adc6b2811d996f30f39258184ba347e8eb5f3811eab89179e8f52d70 WHIRLPOOL cd500c3457be42d8dd927420d2352bda87e7b424fabf19fbd387858b913636793a7ff8d0e249bcc292e58c6d0d3889738c8790f3a6409d6df2da81408a77238c |
22 |
-DIST musl-1.1.13.tar.gz 894640 SHA256 bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013 SHA512 d5f4a6fdb6a2cdbd7ab1ad5a8d91b1c690b3bd31d9049dfc022067019bba11952e375374eed982a0ddac7347d17f9ff2300178c4d5f27bdd8480933cc6e67802 WHIRLPOOL 4e419cebdb4deef4f0828d2b762783e40b1292048c6ba94ba70c48ef5277a1410fe1724ef242e8cab6db51e167e87496de3a8e7c4c016dcd17eadff8d3b3b7fe |
23 |
|
24 |
diff --git a/sys-libs/musl/musl-1.1.13.ebuild b/sys-libs/musl/musl-1.1.13.ebuild |
25 |
deleted file mode 100644 |
26 |
index c983947..0000000 |
27 |
--- a/sys-libs/musl/musl-1.1.13.ebuild |
28 |
+++ /dev/null |
29 |
@@ -1,131 +0,0 @@ |
30 |
-# Copyright 1999-2016 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-r3 |
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="Light, 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 |
-QA_SONAME="/usr/lib/libc.so" |
65 |
-QA_DT_NEEDED="/usr/lib/libc.so" |
66 |
- |
67 |
-is_crosscompile() { |
68 |
- [[ ${CHOST} != ${CTARGET} ]] |
69 |
-} |
70 |
- |
71 |
-just_headers() { |
72 |
- use crosscompile_opts_headers-only && is_crosscompile |
73 |
-} |
74 |
- |
75 |
-musl_endian() { |
76 |
- # XXX: this wont work for bi-endian, but we dont have any |
77 |
- touch "${T}"/endian.s || die |
78 |
- $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o |
79 |
- case $(file "${T}"/endian.o) in |
80 |
- *" MSB "*) echo "";; |
81 |
- *" LSB "*) echo "el";; |
82 |
- *) echo "nfc";; # We shouldn't be here |
83 |
- esac |
84 |
-} |
85 |
- |
86 |
-pkg_setup() { |
87 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
88 |
- case ${CHOST} in |
89 |
- *-musl*) ;; |
90 |
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
91 |
- esac |
92 |
- fi |
93 |
-} |
94 |
- |
95 |
-src_prepare() { |
96 |
- epatch_user |
97 |
-} |
98 |
- |
99 |
-src_configure() { |
100 |
- tc-getCC ${CTARGET} |
101 |
- just_headers && export CC=true |
102 |
- |
103 |
- local sysroot |
104 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
105 |
- ./configure \ |
106 |
- --target=${CTARGET} \ |
107 |
- --prefix=${sysroot}/usr \ |
108 |
- --syslibdir=${sysroot}/lib \ |
109 |
- --disable-gcc-wrapper |
110 |
-} |
111 |
- |
112 |
-src_compile() { |
113 |
- emake obj/include/bits/alltypes.h |
114 |
- just_headers && return 0 |
115 |
- |
116 |
- emake |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- local target="install" |
121 |
- just_headers && target="install-headers" |
122 |
- emake DESTDIR="${D}" ${target} |
123 |
- just_headers && return 0 |
124 |
- |
125 |
- # musl provides ldd via a sym link to its ld.so |
126 |
- local sysroot |
127 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
128 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
129 |
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
130 |
- |
131 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
132 |
- local target=$(tc-arch) arch |
133 |
- local endian=$(musl_endian) |
134 |
- case ${target} in |
135 |
- amd64) arch="x86_64";; |
136 |
- arm) arch="armhf";; # We only have hardfloat right now |
137 |
- mips) arch="mips${endian}";; |
138 |
- ppc) arch="powerpc";; |
139 |
- x86) arch="i386";; |
140 |
- esac |
141 |
- cp "${FILESDIR}"/ldconfig.in "${T}" || die |
142 |
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
143 |
- into / |
144 |
- dosbin "${T}"/ldconfig |
145 |
- into /usr |
146 |
- dobin "${FILESDIR}"/getent |
147 |
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
148 |
- doenvd "${T}"/00musl || die |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
-pkg_postinst() { |
153 |
- is_crosscompile && return 0 |
154 |
- |
155 |
- [ "${ROOT}" != "/" ] && return 0 |
156 |
- |
157 |
- ldconfig |
158 |
- # reload init ... |
159 |
- /sbin/telinit U 2>/dev/null |
160 |
-} |