1 |
commit: 8f15cbafb2aba7eb42ae1af9b2a12c0cb9c96cd8 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 3 11:14:17 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 3 11:18:33 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f15cbaf |
7 |
|
8 |
sys-libs/musl: remove older versions |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
12 |
|
13 |
sys-libs/musl/Manifest | 2 - |
14 |
sys-libs/musl/musl-1.1.20-r1.ebuild | 129 ------------------------------------ |
15 |
sys-libs/musl/musl-1.1.21.ebuild | 124 ---------------------------------- |
16 |
3 files changed, 255 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
19 |
index 71db0a9abd6..ab80508cbad 100644 |
20 |
--- a/sys-libs/musl/Manifest |
21 |
+++ b/sys-libs/musl/Manifest |
22 |
@@ -1,7 +1,5 @@ |
23 |
DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d |
24 |
DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 |
25 |
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf |
26 |
-DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d |
27 |
-DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 |
28 |
DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87 |
29 |
DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09 |
30 |
|
31 |
diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index f53b3b492f0..00000000000 |
34 |
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,129 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=6 |
41 |
- |
42 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
43 |
-if [[ ${PV} == "9999" ]] ; then |
44 |
- EGIT_REPO_URI="git://git.musl-libc.org/musl" |
45 |
- inherit git-r3 |
46 |
- SRC_URI=" |
47 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
48 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
49 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
50 |
- KEYWORDS="" |
51 |
-else |
52 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
53 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
54 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
55 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
56 |
- KEYWORDS="-* amd64 arm ~arm64 ~mips ppc x86" |
57 |
-fi |
58 |
- |
59 |
-export CBUILD=${CBUILD:-${CHOST}} |
60 |
-export CTARGET=${CTARGET:-${CHOST}} |
61 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
62 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
63 |
- export CTARGET=${CATEGORY#cross-} |
64 |
- fi |
65 |
-fi |
66 |
- |
67 |
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" |
68 |
-HOMEPAGE="http://www.musl-libc.org/" |
69 |
-LICENSE="MIT LGPL-2 GPL-2" |
70 |
-SLOT="0" |
71 |
-IUSE="headers-only" |
72 |
- |
73 |
-QA_SONAME="/usr/lib/libc.so" |
74 |
-QA_DT_NEEDED="/usr/lib/libc.so" |
75 |
- |
76 |
-is_crosscompile() { |
77 |
- [[ ${CHOST} != ${CTARGET} ]] |
78 |
-} |
79 |
- |
80 |
-just_headers() { |
81 |
- use headers-only && is_crosscompile |
82 |
-} |
83 |
- |
84 |
-pkg_setup() { |
85 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
86 |
- case ${CHOST} in |
87 |
- *-musl*) ;; |
88 |
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
89 |
- esac |
90 |
- fi |
91 |
- |
92 |
- # fix for #667126, copied from glibc ebuild |
93 |
- # make sure host make.conf doesn't pollute us |
94 |
- if is_crosscompile || tc-is-cross-compiler ; then |
95 |
- CHOST=${CTARGET} strip-unsupported-flags |
96 |
- fi |
97 |
-} |
98 |
- |
99 |
-src_prepare() { |
100 |
- eapply "${FILESDIR}/${P}-fix-getaddrinfo.patch" |
101 |
- eapply_user |
102 |
-} |
103 |
- |
104 |
-src_configure() { |
105 |
- tc-getCC ${CTARGET} |
106 |
- just_headers && export CC=true |
107 |
- |
108 |
- local sysroot |
109 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
110 |
- ./configure \ |
111 |
- --target=${CTARGET} \ |
112 |
- --prefix=${sysroot}/usr \ |
113 |
- --syslibdir=${sysroot}/lib \ |
114 |
- --disable-gcc-wrapper || die |
115 |
-} |
116 |
- |
117 |
-src_compile() { |
118 |
- emake obj/include/bits/alltypes.h |
119 |
- just_headers && return 0 |
120 |
- |
121 |
- emake |
122 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
123 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
124 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
125 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
126 |
- fi |
127 |
-} |
128 |
- |
129 |
-src_install() { |
130 |
- local target="install" |
131 |
- just_headers && target="install-headers" |
132 |
- emake DESTDIR="${D}" ${target} |
133 |
- just_headers && return 0 |
134 |
- |
135 |
- # musl provides ldd via a sym link to its ld.so |
136 |
- local sysroot |
137 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
138 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
139 |
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
140 |
- |
141 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
142 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
143 |
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
144 |
- cp "${FILESDIR}"/ldconfig.in "${T}" || die |
145 |
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
146 |
- into / |
147 |
- dosbin "${T}"/ldconfig |
148 |
- into /usr |
149 |
- dobin "${T}"/getconf |
150 |
- dobin "${T}"/getent |
151 |
- dobin "${T}"/iconv |
152 |
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
153 |
- doenvd "${T}"/00musl || die |
154 |
- fi |
155 |
-} |
156 |
- |
157 |
-pkg_postinst() { |
158 |
- is_crosscompile && return 0 |
159 |
- |
160 |
- [ "${ROOT}" != "/" ] && return 0 |
161 |
- |
162 |
- ldconfig || die |
163 |
- # reload init ... |
164 |
- /sbin/telinit U 2>/dev/null |
165 |
-} |
166 |
|
167 |
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild |
168 |
deleted file mode 100644 |
169 |
index 1f4e2584ce7..00000000000 |
170 |
--- a/sys-libs/musl/musl-1.1.21.ebuild |
171 |
+++ /dev/null |
172 |
@@ -1,124 +0,0 @@ |
173 |
-# Copyright 1999-2019 Gentoo Authors |
174 |
-# Distributed under the terms of the GNU General Public License v2 |
175 |
- |
176 |
-EAPI=6 |
177 |
- |
178 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
179 |
-if [[ ${PV} == "9999" ]] ; then |
180 |
- EGIT_REPO_URI="git://git.musl-libc.org/musl" |
181 |
- inherit git-r3 |
182 |
- SRC_URI=" |
183 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
184 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
185 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
186 |
- KEYWORDS="" |
187 |
-else |
188 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
189 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
190 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
191 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
192 |
- KEYWORDS="-* amd64 arm arm64 ~mips ~ppc x86" |
193 |
-fi |
194 |
- |
195 |
-export CBUILD=${CBUILD:-${CHOST}} |
196 |
-export CTARGET=${CTARGET:-${CHOST}} |
197 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
198 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
199 |
- export CTARGET=${CATEGORY#cross-} |
200 |
- fi |
201 |
-fi |
202 |
- |
203 |
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" |
204 |
-HOMEPAGE="http://www.musl-libc.org/" |
205 |
-LICENSE="MIT LGPL-2 GPL-2" |
206 |
-SLOT="0" |
207 |
-IUSE="headers-only" |
208 |
- |
209 |
-QA_SONAME="/usr/lib/libc.so" |
210 |
-QA_DT_NEEDED="/usr/lib/libc.so" |
211 |
- |
212 |
-is_crosscompile() { |
213 |
- [[ ${CHOST} != ${CTARGET} ]] |
214 |
-} |
215 |
- |
216 |
-just_headers() { |
217 |
- use headers-only && is_crosscompile |
218 |
-} |
219 |
- |
220 |
-pkg_setup() { |
221 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
222 |
- case ${CHOST} in |
223 |
- *-musl*) ;; |
224 |
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
225 |
- esac |
226 |
- fi |
227 |
- |
228 |
- # fix for #667126, copied from glibc ebuild |
229 |
- # make sure host make.conf doesn't pollute us |
230 |
- if is_crosscompile || tc-is-cross-compiler ; then |
231 |
- CHOST=${CTARGET} strip-unsupported-flags |
232 |
- fi |
233 |
-} |
234 |
- |
235 |
-src_configure() { |
236 |
- tc-getCC ${CTARGET} |
237 |
- just_headers && export CC=true |
238 |
- |
239 |
- local sysroot |
240 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
241 |
- ./configure \ |
242 |
- --target=${CTARGET} \ |
243 |
- --prefix=${sysroot}/usr \ |
244 |
- --syslibdir=${sysroot}/lib \ |
245 |
- --disable-gcc-wrapper || die |
246 |
-} |
247 |
- |
248 |
-src_compile() { |
249 |
- emake obj/include/bits/alltypes.h |
250 |
- just_headers && return 0 |
251 |
- |
252 |
- emake |
253 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
254 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
255 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
256 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
257 |
- fi |
258 |
-} |
259 |
- |
260 |
-src_install() { |
261 |
- local target="install" |
262 |
- just_headers && target="install-headers" |
263 |
- emake DESTDIR="${D}" ${target} |
264 |
- just_headers && return 0 |
265 |
- |
266 |
- # musl provides ldd via a sym link to its ld.so |
267 |
- local sysroot |
268 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
269 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
270 |
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
271 |
- |
272 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
273 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
274 |
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
275 |
- cp "${FILESDIR}"/ldconfig.in "${T}" || die |
276 |
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
277 |
- into / |
278 |
- dosbin "${T}"/ldconfig |
279 |
- into /usr |
280 |
- dobin "${T}"/getconf |
281 |
- dobin "${T}"/getent |
282 |
- dobin "${T}"/iconv |
283 |
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
284 |
- doenvd "${T}"/00musl || die |
285 |
- fi |
286 |
-} |
287 |
- |
288 |
-pkg_postinst() { |
289 |
- is_crosscompile && return 0 |
290 |
- |
291 |
- [ "${ROOT}" != "/" ] && return 0 |
292 |
- |
293 |
- ldconfig || die |
294 |
- # reload init ... |
295 |
- /sbin/telinit U 2>/dev/null |
296 |
-} |