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