Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/musl: musl-1.1.4.ebuild musl-1.0.4.ebuild ChangeLog
Date: Fri, 01 Aug 2014 12:48:07
Message-Id: 20140801124801.A64B32004E@flycatcher.gentoo.org
1 blueness 14/08/01 12:48:00
2
3 Modified: ChangeLog
4 Added: musl-1.1.4.ebuild musl-1.0.4.ebuild
5 Log:
6 Version bumps
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
9
10 Revision Changes Path
11 1.28 sys-libs/musl/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.28&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?rev=1.28&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/ChangeLog?r1=1.27&r2=1.28
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v
20 retrieving revision 1.27
21 retrieving revision 1.28
22 diff -u -r1.27 -r1.28
23 --- ChangeLog 21 Jul 2014 22:13:43 -0000 1.27
24 +++ ChangeLog 1 Aug 2014 12:48:00 -0000 1.28
25 @@ -1,6 +1,13 @@
26 # ChangeLog for sys-libs/musl
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.27 2014/07/21 22:13:43 blueness Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.28 2014/08/01 12:48:00 blueness Exp $
30 +
31 +*musl-1.0.4 (01 Aug 2014)
32 +*musl-1.1.4 (01 Aug 2014)
33 +
34 + 01 Aug 2014; Anthony G. Basile <blueness@g.o> +musl-1.0.4.ebuild,
35 + +musl-1.1.4.ebuild:
36 + Version bumps
37
38 21 Jul 2014; Anthony G. Basile <blueness@g.o> musl-1.0.3.ebuild,
39 musl-1.1.3.ebuild:
40
41
42
43 1.1 sys-libs/musl/musl-1.1.4.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.4.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.1.4.ebuild?rev=1.1&content-type=text/plain
47
48 Index: musl-1.1.4.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.1.4.ebuild,v 1.1 2014/08/01 12:48:00 blueness Exp $
53
54 EAPI=5
55
56 inherit eutils flag-o-matic multilib toolchain-funcs
57 if [[ ${PV} == "9999" ]] ; then
58 EGIT_REPO_URI="git://git.musl-libc.org/musl"
59 inherit git-2
60 fi
61
62 export CBUILD=${CBUILD:-${CHOST}}
63 export CTARGET=${CTARGET:-${CHOST}}
64 if [[ ${CTARGET} == ${CHOST} ]] ; then
65 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
66 export CTARGET=${CATEGORY/cross-}
67 fi
68 fi
69
70 DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
71 HOMEPAGE="http://www.musl-libc.org/"
72 if [[ ${PV} != "9999" ]] ; then
73 PATCH_VER=""
74 SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
75 KEYWORDS="-* ~amd64 ~arm ~mips ~x86"
76 fi
77
78 LICENSE="MIT"
79 SLOT="0"
80 IUSE="crosscompile_opts_headers-only nls"
81
82 RDEPEND="nls? ( sys-devel/gettext )"
83 if [[ ${CATEGORY} != cross-* ]] ; then
84 RDEPEND+=" sys-apps/getent"
85 fi
86
87 is_crosscompile() {
88 [[ ${CHOST} != ${CTARGET} ]]
89 }
90
91 just_headers() {
92 use crosscompile_opts_headers-only && is_crosscompile
93 }
94
95 pkg_setup() {
96 if [ ${CTARGET} == ${CHOST} ] ; then
97 case ${CHOST} in
98 *-musl*) ;;
99 *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
100 esac
101 fi
102 }
103
104 src_prepare() {
105 use mips && epatch "${FILESDIR}"/${PN}-fix-mips-dynlink.patch
106 }
107
108 src_configure() {
109 tc-export CC
110
111 ./configure \
112 --target="${CTARGET}" \
113 --prefix="/usr" \
114 --disable-gcc-wrapper
115 }
116
117 src_compile() {
118 emake include/bits/alltypes.h || die
119 just_headers && return 0
120
121 emake || die
122 }
123
124 src_install() {
125 local sysroot=${D}
126 is_crosscompile && sysroot+="/usr/${CTARGET}"
127
128 local target="install"
129 just_headers && target="install-headers"
130 emake DESTDIR="${sysroot}" ${target} || die
131
132 # Make sure we install the sys-include symlink so that when
133 # we build a 2nd stage cross-compiler, gcc finds the target
134 # system headers correctly. See gcc/doc/gccinstall.info
135 if is_crosscompile ; then
136 dosym usr/include /usr/${CTARGET}/sys-include
137 fi
138
139 # If we are going to use gnu's gettext then we have to
140 # move musl's libintl out of the way.
141 use nls && mv "${D}"/usr/include/libintl{,-musl}.h
142 }
143
144 pkg_postinst() {
145 is_crosscompile && return 0
146
147 [ "${ROOT}" != "/" ] && return 0
148
149 # TODO: musl doesn't use ldconfig, instead here we can
150 # create sym links to libraries outside of /lib and /usr/lib
151 ldconfig
152 # reload init ...
153 /sbin/telinit U 2>/dev/null
154 }
155
156
157
158 1.1 sys-libs/musl/musl-1.0.4.ebuild
159
160 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.0.4.ebuild?rev=1.1&view=markup
161 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/musl/musl-1.0.4.ebuild?rev=1.1&content-type=text/plain
162
163 Index: musl-1.0.4.ebuild
164 ===================================================================
165 # Copyright 1999-2014 Gentoo Foundation
166 # Distributed under the terms of the GNU General Public License v2
167 # $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-1.0.4.ebuild,v 1.1 2014/08/01 12:48:00 blueness Exp $
168
169 EAPI=5
170
171 inherit eutils flag-o-matic multilib toolchain-funcs
172 if [[ ${PV} == "9999" ]] ; then
173 EGIT_REPO_URI="git://git.musl-libc.org/musl"
174 inherit git-2
175 fi
176
177 export CBUILD=${CBUILD:-${CHOST}}
178 export CTARGET=${CTARGET:-${CHOST}}
179 if [[ ${CTARGET} == ${CHOST} ]] ; then
180 if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
181 export CTARGET=${CATEGORY/cross-}
182 fi
183 fi
184
185 DESCRIPTION="Lightweight, fast and simple C library focused on standards-conformance and safety"
186 HOMEPAGE="http://www.musl-libc.org/"
187 if [[ ${PV} != "9999" ]] ; then
188 PATCH_VER=""
189 SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz"
190 KEYWORDS="-* ~amd64 ~arm ~mips ~x86"
191 fi
192
193 LICENSE="MIT"
194 SLOT="0"
195 IUSE="crosscompile_opts_headers-only nls"
196
197 RDEPEND="nls? ( sys-devel/gettext )"
198 if [[ ${CATEGORY} != cross-* ]] ; then
199 RDEPEND+=" sys-apps/getent"
200 fi
201
202 is_crosscompile() {
203 [[ ${CHOST} != ${CTARGET} ]]
204 }
205
206 just_headers() {
207 use crosscompile_opts_headers-only && is_crosscompile
208 }
209
210 pkg_setup() {
211 if [ ${CTARGET} == ${CHOST} ] ; then
212 case ${CHOST} in
213 *-musl*) ;;
214 *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
215 esac
216 fi
217 }
218
219 src_configure() {
220 tc-export CC
221
222 ./configure \
223 --target="${CTARGET}" \
224 --prefix="/usr" \
225 --disable-gcc-wrapper
226 }
227
228 src_compile() {
229 emake include/bits/alltypes.h || die
230 just_headers && return 0
231
232 emake || die
233 }
234
235 src_install() {
236 local sysroot=${D}
237 is_crosscompile && sysroot+="/usr/${CTARGET}"
238
239 local target="install"
240 just_headers && target="install-headers"
241 emake DESTDIR="${sysroot}" ${target} || die
242
243 # Make sure we install the sys-include symlink so that when
244 # we build a 2nd stage cross-compiler, gcc finds the target
245 # system headers correctly. See gcc/doc/gccinstall.info
246 if is_crosscompile ; then
247 dosym usr/include /usr/${CTARGET}/sys-include
248 fi
249
250 # If we are going to use gnu's gettext then we have to
251 # move musl's libintl out of the way.
252 use nls && mv "${D}"/usr/include/libintl{,-musl}.h
253 }
254
255 pkg_postinst() {
256 is_crosscompile && return 0
257
258 [ "${ROOT}" != "/" ] && return 0
259
260 # TODO: musl doesn't use ldconfig, instead here we can
261 # create sym links to libraries outside of /lib and /usr/lib
262 ldconfig
263 # reload init ...
264 /sbin/telinit U 2>/dev/null
265 }