1 |
commit: b4efe64b251c68c9809124e1d848bac741d588a1 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 10 19:53:29 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 10 19:53:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4efe64b |
7 |
|
8 |
sys-libs/musl: version bump to 1.1.22 |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
12 |
|
13 |
sys-libs/musl/Manifest | 1 + |
14 |
sys-libs/musl/musl-1.1.22.ebuild | 118 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 119 insertions(+) |
16 |
|
17 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
18 |
index cdbdd35d7e7..60cde385e12 100644 |
19 |
--- a/sys-libs/musl/Manifest |
20 |
+++ b/sys-libs/musl/Manifest |
21 |
@@ -3,3 +3,4 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40 |
22 |
DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf |
23 |
DIST musl-1.1.20.tar.gz 977827 BLAKE2B c8ce3cc1885e8103e1cf9d67183d89e5e222fd317158b20f25a8e1855a3cd5d16c79b4d95ff896fe7262f233141c3f3ca4dfc6a26a2373ab1d29a3c66b904e61 SHA512 d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d |
24 |
DIST musl-1.1.21.tar.gz 987341 BLAKE2B e080ee040ad5b7901f72d27a7e269ae4173eed8774510546abc8e53727a7443ed3590a802e6d750e2841313efb23e0c4097e3bf6232f4b84a777317e9b8260e7 SHA512 fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 |
25 |
+DIST musl-1.1.22.tar.gz 987296 BLAKE2B 0326751e1d1bd5b909938159e709daa1ca0b2e51a3f3dc1fc80caa3e7fc0e9fe0fa64d6dfe7d870057fa8e97100a3a89bfe4449fd4c04fe3af17d0f105dfb9cd SHA512 08a40d722672504427238e71c9e52a723c6a14735abe9581d6d4bb3f86662d5d51a3f32a6aed6420c1f9680e22a3a554a9b87ae342635be971e2db49cc9fdb87 |
26 |
|
27 |
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..22f16fa8bfb |
30 |
--- /dev/null |
31 |
+++ b/sys-libs/musl/musl-1.1.22.ebuild |
32 |
@@ -0,0 +1,118 @@ |
33 |
+# Copyright 1999-2019 Gentoo Authors |
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 ~arm64 ~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 |
+} |