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: Thu, 02 Aug 2018 23:13:59
Message-Id: 1533251612.d024ef29e98fa96cac267601253a4a4b447107ac.blueness@gentoo
1 commit: d024ef29e98fa96cac267601253a4a4b447107ac
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 2 23:13:32 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 2 23:13:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d024ef29
7
8 sys-libs/musl: remove older stable version
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 sys-libs/musl/Manifest | 1 -
13 sys-libs/musl/musl-1.1.18.ebuild | 118 ---------------------------------------
14 2 files changed, 119 deletions(-)
15
16 diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
17 index 795b389167e..ee29fa7fe65 100644
18 --- a/sys-libs/musl/Manifest
19 +++ b/sys-libs/musl/Manifest
20 @@ -1,5 +1,4 @@
21 DIST getconf.c 11614 BLAKE2B ba49a573fc16d51780a0b0b81fbf7b64a1142f1dbad203c9609a59b6b07e7404f676c415383ae88c0aede95694821f6ee381bffd93cc3330501e17dc07d122bd SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d
22 DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf4081570c3d7a10497024da5815a485fc4728adc9eebd270aec99ba93b7546b38c728978e3e00b SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2
23 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
24 -DIST musl-1.1.18.tar.gz 936274 BLAKE2B 981be737026eddb4527507ec9975531dba25d165b0b064076cc3a900bdf98c3d25ee130a3d615e4b9635ef3ffcc256bf00d21180eb8d04b61d9ec8b6bc531fb6 SHA512 4d55c92efe41dfdd9fff6aca5dda76a632a3be60d10e5a7f66a4731d8f7040fb0a20b998965ba4d069b4f8a3527fcd7388e646cb66afc649c4d0cc6c3d358c9c
25 DIST musl-1.1.19.tar.gz 960319 BLAKE2B 3e69de2ed9384fe200bb64e603f342a930acf035cf7bac8fe3cd4225800424207df2b73fe6fabf3147fc8023a655839c33f50c0be8e30f51f76b84aba4de30b5 SHA512 abee52d53af4b3c14c9088866c911a24d2b6ef67dc494f38a7a09dfe77250026f77528c24c52469c89cffa8ced2f0fa95badbdcf8d4460c90faba47e3927bcc5
26
27 diff --git a/sys-libs/musl/musl-1.1.18.ebuild b/sys-libs/musl/musl-1.1.18.ebuild
28 deleted file mode 100644
29 index e36e2199458..00000000000
30 --- a/sys-libs/musl/musl-1.1.18.ebuild
31 +++ /dev/null
32 @@ -1,118 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit eutils flag-o-matic multilib toolchain-funcs
39 -if [[ ${PV} == "9999" ]] ; then
40 - EGIT_REPO_URI="git://git.musl-libc.org/musl"
41 - inherit git-r3
42 - SRC_URI="
43 - https://dev.gentoo.org/~blueness/musl-misc/getconf.c
44 - https://dev.gentoo.org/~blueness/musl-misc/getent.c
45 - https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
46 - KEYWORDS=""
47 -else
48 - SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
49 - https://dev.gentoo.org/~blueness/musl-misc/getconf.c
50 - https://dev.gentoo.org/~blueness/musl-misc/getent.c
51 - https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
52 - KEYWORDS="-* amd64 arm ~mips ppc x86"
53 -fi
54 -
55 -export CBUILD=${CBUILD:-${CHOST}}
56 -export CTARGET=${CTARGET:-${CHOST}}
57 -if [[ ${CTARGET} == ${CHOST} ]] ; then
58 - if [[ ${CATEGORY} == cross-* ]] ; then
59 - export CTARGET=${CATEGORY#cross-}
60 - fi
61 -fi
62 -
63 -DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
64 -HOMEPAGE="http://www.musl-libc.org/"
65 -LICENSE="MIT LGPL-2 GPL-2"
66 -SLOT="0"
67 -IUSE="headers-only"
68 -
69 -QA_SONAME="/usr/lib/libc.so"
70 -QA_DT_NEEDED="/usr/lib/libc.so"
71 -
72 -is_crosscompile() {
73 - [[ ${CHOST} != ${CTARGET} ]]
74 -}
75 -
76 -just_headers() {
77 - use headers-only && is_crosscompile
78 -}
79 -
80 -pkg_setup() {
81 - if [ ${CTARGET} == ${CHOST} ] ; then
82 - case ${CHOST} in
83 - *-musl*) ;;
84 - *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
85 - esac
86 - fi
87 -}
88 -
89 -src_configure() {
90 - tc-getCC ${CTARGET}
91 - just_headers && export CC=true
92 -
93 - local sysroot
94 - is_crosscompile && sysroot=/usr/${CTARGET}
95 - ./configure \
96 - --target=${CTARGET} \
97 - --prefix=${sysroot}/usr \
98 - --syslibdir=${sysroot}/lib \
99 - --disable-gcc-wrapper || die
100 -}
101 -
102 -src_compile() {
103 - emake obj/include/bits/alltypes.h
104 - just_headers && return 0
105 -
106 - emake
107 - if [[ ${CATEGORY} != cross-* ]] ; then
108 - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
109 - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
110 - $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
111 - fi
112 -}
113 -
114 -src_install() {
115 - local target="install"
116 - just_headers && target="install-headers"
117 - emake DESTDIR="${D}" ${target}
118 - just_headers && return 0
119 -
120 - # musl provides ldd via a sym link to its ld.so
121 - local sysroot
122 - is_crosscompile && sysroot=/usr/${CTARGET}
123 - local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
124 - dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
125 -
126 - if [[ ${CATEGORY} != cross-* ]] ; then
127 - local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
128 - [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
129 - cp "${FILESDIR}"/ldconfig.in "${T}" || die
130 - sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
131 - into /
132 - dosbin "${T}"/ldconfig
133 - into /usr
134 - dobin "${T}"/getconf
135 - dobin "${T}"/getent
136 - dobin "${T}"/iconv
137 - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
138 - doenvd "${T}"/00musl || die
139 - fi
140 -}
141 -
142 -pkg_postinst() {
143 - is_crosscompile && return 0
144 -
145 - [ "${ROOT}" != "/" ] && return 0
146 -
147 - ldconfig || die
148 - # reload init ...
149 - /sbin/telinit U 2>/dev/null
150 -}