1 |
commit: e4f7634e26ced285636cf825b455855580e7141a |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 31 20:38:52 2017 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 31 20:38:52 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f7634e |
7 |
|
8 |
sys-libs/musl: drop keywords as much as possible previous to 1.1.17, bug #636060 |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
sys-libs/musl/Manifest | 1 - |
13 |
sys-libs/musl/musl-1.1.15-r2.ebuild | 121 ------------------------------------ |
14 |
sys-libs/musl/musl-1.1.16.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 123 deletions(-) |
16 |
|
17 |
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest |
18 |
index 336a4e0f877..6f35b19af5e 100644 |
19 |
--- a/sys-libs/musl/Manifest |
20 |
+++ b/sys-libs/musl/Manifest |
21 |
@@ -1,6 +1,5 @@ |
22 |
DIST getconf.c 11614 SHA256 d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c SHA512 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d WHIRLPOOL 279170a21cd6d5b560b0c834236acf4989f1a7f5e9ecf9d7e594abc21b65f8aeb26a26475c49f4052d5f9b4f9d95032d22b1790dbd99e3f55c3677eb9fc6df8b |
23 |
DIST getent.c 9438 SHA256 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe SHA512 b35de9847353b273516162ed4828a810c6130fc5b7de44ee4433003b3f99647b25792d9b1c40dfc67069add11f3fb850e5c35d4f1912dccac108059bbbdfd5a2 WHIRLPOOL 473e54a9158e70c411f4c84e590bcfd245051212a3346a3c6dd45df9f09a5fbccbc8900ad7f8691eb5ebb8cd1002caf9519abaffb1753175d4f8acb1d32236b4 |
24 |
DIST iconv.c 2577 SHA256 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf WHIRLPOOL 8b067d7f3e5b8c9862cf78cf727fa748d9b6b23be518df382251d1e3e0a6eb386b1fd7788ba3b36dadba03aa5b43e25eb25528efcadc74fa543c38a61650c5bc |
25 |
-DIST musl-1.1.15.tar.gz 911600 SHA256 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa SHA512 9e923572c0d6bad3dc2d2646d4b0699c10b477ce6300ac6c6224895192a90667f581ddf6eda2ab8c4c16f47bde4bccb03bb90478638d136d9df721430f4d0163 WHIRLPOOL 68c510cf7d4216ccc5775466fa23f76ebecf1658552d613dee523bb7cc3a9f824959fe76355d1ce47326b276bf2657c9b4f3f557d81bf9c1a873f18405ad8ebf |
26 |
DIST musl-1.1.16.tar.gz 927178 SHA256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 SHA512 47c00e50b7605102fb4aebe1f9ba9db94d26fac64805f6d744c9c557a05b8a58dff7f9558ff7c8d66b5d7c43740cdc2dd79448bacac47f1414e6ada99c210140 WHIRLPOOL d4e84ef591a1cee0a64d4abf258b7cb2eeacfa7b11695b1bfa89bafde0404e8310a02ab04814df2d4a9ac812a640bbcf8695bab10807f8b8d64c5bdb9d468ca4 |
27 |
DIST musl-1.1.17.tar.gz 936290 SHA256 c8aa51c747a600704bed169340bf3e03742ceee027ea0051dd4b6cc3c5f51464 SHA512 bc99c7d58d64116c03e68fe77141a1f2938e0c01ba027937587a060d435b4b00b8b1f18c63fb8ed445ef36f377974e02a7b4821c793e4292041e31e66f145428 WHIRLPOOL 28cf246578c0a70d29a015a37136c9dda0b891b17048b35e84b2f4bebc47a417cd4dc3e6f7f7b5889393117e00b3f7469355338e44b063f79269824fdda4ffbd |
28 |
|
29 |
diff --git a/sys-libs/musl/musl-1.1.15-r2.ebuild b/sys-libs/musl/musl-1.1.15-r2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 38374a82349..00000000000 |
32 |
--- a/sys-libs/musl/musl-1.1.15-r2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,121 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-inherit eutils flag-o-matic multilib toolchain-funcs |
41 |
-if [[ ${PV} == "9999" ]] ; then |
42 |
- EGIT_REPO_URI="git://git.musl-libc.org/musl" |
43 |
- inherit git-r3 |
44 |
- SRC_URI=" |
45 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
46 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
47 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
48 |
- KEYWORDS="" |
49 |
-else |
50 |
- SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz |
51 |
- https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
52 |
- https://dev.gentoo.org/~blueness/musl-misc/getent.c |
53 |
- https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
54 |
- KEYWORDS="-* amd64 arm ~mips ppc x86" |
55 |
-fi |
56 |
- |
57 |
-export CBUILD=${CBUILD:-${CHOST}} |
58 |
-export CTARGET=${CTARGET:-${CHOST}} |
59 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
60 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
61 |
- export CTARGET=${CATEGORY#cross-} |
62 |
- fi |
63 |
-fi |
64 |
- |
65 |
-DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety" |
66 |
-HOMEPAGE="http://www.musl-libc.org/" |
67 |
-LICENSE="MIT LGPL-2 GPL-2" |
68 |
-SLOT="0" |
69 |
-IUSE="crosscompile_opts_headers-only" |
70 |
- |
71 |
-QA_SONAME="/usr/lib/libc.so" |
72 |
-QA_DT_NEEDED="/usr/lib/libc.so" |
73 |
- |
74 |
-PATCHES=( |
75 |
- "${FILESDIR}/${P}-assert.patch" |
76 |
- "${FILESDIR}/${P}-CVE.patch" |
77 |
- ) |
78 |
- |
79 |
-is_crosscompile() { |
80 |
- [[ ${CHOST} != ${CTARGET} ]] |
81 |
-} |
82 |
- |
83 |
-just_headers() { |
84 |
- use crosscompile_opts_headers-only && is_crosscompile |
85 |
-} |
86 |
- |
87 |
-pkg_setup() { |
88 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
89 |
- case ${CHOST} in |
90 |
- *-musl*) ;; |
91 |
- *) die "Use sys-devel/crossdev to build a musl toolchain" ;; |
92 |
- esac |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
-src_configure() { |
97 |
- tc-getCC ${CTARGET} |
98 |
- just_headers && export CC=true |
99 |
- |
100 |
- local sysroot |
101 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
102 |
- ./configure \ |
103 |
- --target=${CTARGET} \ |
104 |
- --prefix=${sysroot}/usr \ |
105 |
- --syslibdir=${sysroot}/lib \ |
106 |
- --disable-gcc-wrapper || die |
107 |
-} |
108 |
- |
109 |
-src_compile() { |
110 |
- emake obj/include/bits/alltypes.h |
111 |
- just_headers && return 0 |
112 |
- |
113 |
- emake |
114 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die |
115 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die |
116 |
- $(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die |
117 |
-} |
118 |
- |
119 |
-src_install() { |
120 |
- local target="install" |
121 |
- just_headers && target="install-headers" |
122 |
- emake DESTDIR="${D}" ${target} |
123 |
- just_headers && return 0 |
124 |
- |
125 |
- # musl provides ldd via a sym link to its ld.so |
126 |
- local sysroot |
127 |
- is_crosscompile && sysroot=/usr/${CTARGET} |
128 |
- local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*) |
129 |
- dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd |
130 |
- |
131 |
- if [[ ${CATEGORY} != cross-* ]] ; then |
132 |
- local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p') |
133 |
- [[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die |
134 |
- cp "${FILESDIR}"/ldconfig.in "${T}" || die |
135 |
- sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die |
136 |
- into / |
137 |
- dosbin "${T}"/ldconfig |
138 |
- into /usr |
139 |
- dobin "${T}"/getconf |
140 |
- dobin "${T}"/getent |
141 |
- dobin "${T}"/iconv |
142 |
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die |
143 |
- doenvd "${T}"/00musl || die |
144 |
- fi |
145 |
-} |
146 |
- |
147 |
-pkg_postinst() { |
148 |
- is_crosscompile && return 0 |
149 |
- |
150 |
- [ "${ROOT}" != "/" ] && return 0 |
151 |
- |
152 |
- ldconfig || die |
153 |
- # reload init ... |
154 |
- /sbin/telinit U 2>/dev/null |
155 |
-} |
156 |
|
157 |
diff --git a/sys-libs/musl/musl-1.1.16.ebuild b/sys-libs/musl/musl-1.1.16.ebuild |
158 |
index af34891af2d..497fb924b5a 100644 |
159 |
--- a/sys-libs/musl/musl-1.1.16.ebuild |
160 |
+++ b/sys-libs/musl/musl-1.1.16.ebuild |
161 |
@@ -17,7 +17,7 @@ else |
162 |
https://dev.gentoo.org/~blueness/musl-misc/getconf.c |
163 |
https://dev.gentoo.org/~blueness/musl-misc/getent.c |
164 |
https://dev.gentoo.org/~blueness/musl-misc/iconv.c" |
165 |
- KEYWORDS="-* amd64 arm ~mips ppc x86" |
166 |
+ KEYWORDS="-* arm ppc" |
167 |
fi |
168 |
|
169 |
export CBUILD=${CBUILD:-${CHOST}} |