1 |
commit: 78527a00ee720e32ca54a3c15335fe6e41d95e27 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 11 12:15:03 2017 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 11 12:15:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78527a00 |
7 |
|
8 |
sys-libs/glibc: Clean up |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
sys-libs/glibc/Manifest | 3 - |
13 |
sys-libs/glibc/glibc-2.24-r4.ebuild | 155 ------------------------------------ |
14 |
sys-libs/glibc/glibc-2.25-r2.ebuild | 150 ---------------------------------- |
15 |
sys-libs/glibc/glibc-2.25-r3.ebuild | 150 ---------------------------------- |
16 |
4 files changed, 458 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
19 |
index 9797c36c244..b8d66c32d1a 100644 |
20 |
--- a/sys-libs/glibc/Manifest |
21 |
+++ b/sys-libs/glibc/Manifest |
22 |
@@ -14,11 +14,8 @@ DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056a |
23 |
DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256 97ef9e370ce9b09d8e9b9f6239f7ef94dd837d29b7bfc1404438c63da1d534ac SHA512 c0d0cab0a370acef0b085b0ab09ce868425a12bbb371d0a9ff91dc83a74a0d8d3b541d10c44650b00b7cb155f8ac1f87764e6a6bd9d6bae8a9a904b4df1650ef WHIRLPOOL 128ea1a2eeaad3d95cdf1054d10232a34e8f88d10ed8907a67d9ff02734243d20b21595ca3698a4861d9c65e2a59aedbcf8e399bd1ed879dba1556ce2995ad9b |
24 |
DIST glibc-2.23-patches-8.tar.bz2 304199 SHA256 6110777176abfb8d287d82804d98e007c255db6040a1beca589a212772c90482 SHA512 470814bbbd9d4ee5fa2dd7570a2e14b0229723e373e801472856fd6c2f089499eddc300f69b49af8ba0edbdca583ee3ca521fdb5c642509717cafea0ad925fd2 WHIRLPOOL 1ef9a431d67d7669f34f7db21185d50ddd6dc82c549a9ff274f0b98454417f4098ee771bfe10073be12d3c153ee46ff36e40b46ecb31844ab09791ae29b49074 |
25 |
DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71 |
26 |
-DIST glibc-2.24-patches-10.tar.bz2 73586 SHA256 d479033b63ff796fea56fb1bde390c442021acd856994b15c983b4a89e46fbbe SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca WHIRLPOOL 7afe94307900a70de2f5e028d8ec9e0f4b06b661ec6493217e51a13d750f891e10b45c0f66d86fa83c16cc3ce539bb257039b33bc3e363469cd03502d956d75e |
27 |
DIST glibc-2.24-patches-8.tar.bz2 71769 SHA256 0a21549ed196c5c03efc37273fb991e199c585140d954dca61140c3d0c227af9 SHA512 897c9d158f898edb355ee6478a7e0372a29e6c9d0b98cd80ccaa3ed4f0aab35e3b038217735f2a3b6007ff0cf27c7d6b27a84daaceca9361dce04bc5b2124ada WHIRLPOOL 222b375249c5a3e53fd0116fadf9612c5e5479cd845dc3fcebb496dfe38d70d0e2c84517b79258c73afe2c1f5d15ecec768d33659c10fb15ae59b9061072987d |
28 |
DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb WHIRLPOOL be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb |
29 |
-DIST glibc-2.25-patches-5.tar.bz2 44356 SHA256 d9ea3908c8c4d561d22697d9830b4032cbbba46822613d5a3509d3b7e579c016 SHA512 ad3acf760e6cd714fe5d6833b53d8759e09c74ca60fbfd173e87dbb2d1062a5006427ca17db0b6ce695dae03e2ace7dc30992ae9b08e94ae4350b19ea03acdcc WHIRLPOOL 1fa660852f9e42fda956b4924351a532efdca88691cb2855c458e8bb9af1fc3cbdf2eb9c8ce93a7c57fa2d6a7e20b1c1a5c17d29b0d07f8e44e0ed8fdb7db8bc |
30 |
-DIST glibc-2.25-patches-7.tar.bz2 46222 SHA256 af1a3c13409599486d58c531d04d794698b1ac04cc883dbdb0d29af7b44d7ca5 SHA512 21637f3b1a20cef55ce52311bc7b4d60d93b6f04a8d45944ccb9286fc330e262c6f37f729b7f5a5daec588821e8ae330f89cb7f7e84463b4e533aa80f408e415 WHIRLPOOL bc48fa53ddd264559378e8075c42bd38fd49015ac76834aaed7e0ec338dbbba1f4fdc1d2aaea6d53d72bbbaef99920cad489188b95cd0ec06b02ce5def110c11 |
31 |
DIST glibc-2.25-patches-8.tar.bz2 47110 SHA256 1dc41664153369886d240a1851b15bf0c3c3739c8319e6d68cb0c2f85fc98901 SHA512 41d772c47770a63502c863f3c9bb05164e0ceab69fb7b7f355c25685ae4285d73e9ab0e3836162bd11852339055329d0bdc7238f3191fde39a50ce0d9a60454c WHIRLPOOL c6e0443d75e2e4607226caa4df1ce2b10ef21ec2564b447e2a287888d1f593d51f334a6e1ab942f5d1602d02c6fee87ce4ef9a7db3409de6063bc377a470a42d |
32 |
DIST glibc-2.25-patches-9.tar.bz2 67901 SHA256 cbd8af837aa0776940fd41e34874e930a7f25d78cdd212e138dd9a85e1349519 SHA512 b4f0be5b20834aff102394df23084cc0adf1ab674e6ce050550f6b6658cf0eab57f7685cac079b1a19388dba927a36b8ca31f58af3dddc559d7230674ffd59b5 WHIRLPOOL 81c18056fe26a79c7a7598da1181ba02e83daf7d9e9883a3c1195804a35fe22a79d7cc4a8411f2f4a4ce6430e506978199f59b61d3ed0a70b4e4f7dd05ecfafe |
33 |
DIST glibc-2.25.tar.xz 13873900 SHA256 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e WHIRLPOOL dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953 |
34 |
|
35 |
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild |
36 |
deleted file mode 100644 |
37 |
index 29a17f827ae..00000000000 |
38 |
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,155 +0,0 @@ |
41 |
-# Copyright 1999-2017 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI="5" |
45 |
- |
46 |
-inherit toolchain-glibc |
47 |
- |
48 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
49 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
50 |
- |
51 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
53 |
-RESTRICT="strip" # strip ourself #46186 |
54 |
-EMULTILIB_PKG="true" |
55 |
- |
56 |
-# Configuration variables |
57 |
-RELEASE_VER="" |
58 |
-case ${PV} in |
59 |
-9999*) |
60 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
61 |
- EGIT_SOURCEDIRS="${S}" |
62 |
- inherit git-2 |
63 |
- ;; |
64 |
-*) |
65 |
- RELEASE_VER=${PV} |
66 |
- ;; |
67 |
-esac |
68 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
69 |
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/ |
70 |
-PATCH_VER="10" # Gentoo patchset |
71 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
72 |
- |
73 |
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
74 |
- |
75 |
-# Here's how the cross-compile logic breaks down ... |
76 |
-# CTARGET - machine that will target the binaries |
77 |
-# CHOST - machine that will host the binaries |
78 |
-# CBUILD - machine that will build the binaries |
79 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
80 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
81 |
-# CBUILD = CHOST = CTARGET - native build/install |
82 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
83 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
84 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
85 |
-# For install paths: |
86 |
-# CHOST = CTARGET - install into / |
87 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
88 |
- |
89 |
-export CBUILD=${CBUILD:-${CHOST}} |
90 |
-export CTARGET=${CTARGET:-${CHOST}} |
91 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
92 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
93 |
- export CTARGET=${CATEGORY#cross-} |
94 |
- fi |
95 |
-fi |
96 |
- |
97 |
-is_crosscompile() { |
98 |
- [[ ${CHOST} != ${CTARGET} ]] |
99 |
-} |
100 |
- |
101 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
102 |
-# Everyone knows 2.2 > 0, duh. |
103 |
-SLOT="2.2" |
104 |
- |
105 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
106 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
107 |
-COMMON_DEPEND=" |
108 |
- nscd? ( selinux? ( |
109 |
- audit? ( sys-process/audit ) |
110 |
- caps? ( sys-libs/libcap ) |
111 |
- ) ) |
112 |
- suid? ( caps? ( sys-libs/libcap ) ) |
113 |
- selinux? ( sys-libs/libselinux ) |
114 |
-" |
115 |
-DEPEND="${COMMON_DEPEND} |
116 |
- >=app-misc/pax-utils-0.1.10 |
117 |
- !<sys-apps/sandbox-1.6 |
118 |
- !<sys-apps/portage-2.1.2" |
119 |
-RDEPEND="${COMMON_DEPEND} |
120 |
- !sys-kernel/ps3-sources |
121 |
- sys-apps/gentoo-functions |
122 |
- !sys-libs/nss-db" |
123 |
- |
124 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
125 |
- DEPEND+=" !crosscompile_opts_headers-only? ( |
126 |
- >=${CATEGORY}/binutils-2.24 |
127 |
- >=${CATEGORY}/gcc-4.7 |
128 |
- )" |
129 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
130 |
-else |
131 |
- DEPEND+=" |
132 |
- >=sys-devel/binutils-2.24 |
133 |
- >=sys-devel/gcc-4.7 |
134 |
- virtual/os-headers" |
135 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
136 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
137 |
-fi |
138 |
- |
139 |
-upstream_uris() { |
140 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
141 |
-} |
142 |
-gentoo_uris() { |
143 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" |
144 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
145 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
146 |
-} |
147 |
-SRC_URI=$( |
148 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
149 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
150 |
-) |
151 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
152 |
- |
153 |
-src_unpack() { |
154 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
155 |
- |
156 |
- toolchain-glibc_src_unpack |
157 |
-} |
158 |
- |
159 |
-src_prepare() { |
160 |
- toolchain-glibc_src_prepare |
161 |
- |
162 |
- cd "${S}" |
163 |
- |
164 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
165 |
- |
166 |
- if use hardened ; then |
167 |
- # We don't enable these for non-hardened as the output is very terse -- |
168 |
- # it only states that a crash happened. The default upstream behavior |
169 |
- # includes backtraces and symbols. |
170 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
171 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
172 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die |
173 |
- |
174 |
- if use debug ; then |
175 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
176 |
- sed -i \ |
177 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
178 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
179 |
- debug/Makefile || die |
180 |
- fi |
181 |
- |
182 |
- # Build various bits with ssp-all |
183 |
- sed -i \ |
184 |
- -e 's:-fstack-protector$:-fstack-protector-all:' \ |
185 |
- */Makefile || die |
186 |
- fi |
187 |
- |
188 |
- case $(gcc-fullversion) in |
189 |
- 4.8.[0-3]|4.9.0) |
190 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
191 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
192 |
- die "need to switch compilers #547420" |
193 |
- ;; |
194 |
- esac |
195 |
-} |
196 |
|
197 |
diff --git a/sys-libs/glibc/glibc-2.25-r2.ebuild b/sys-libs/glibc/glibc-2.25-r2.ebuild |
198 |
deleted file mode 100644 |
199 |
index 61088f71f41..00000000000 |
200 |
--- a/sys-libs/glibc/glibc-2.25-r2.ebuild |
201 |
+++ /dev/null |
202 |
@@ -1,150 +0,0 @@ |
203 |
-# Copyright 1999-2017 Gentoo Foundation |
204 |
-# Distributed under the terms of the GNU General Public License v2 |
205 |
- |
206 |
-EAPI="5" |
207 |
- |
208 |
-inherit toolchain-glibc |
209 |
- |
210 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
211 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
212 |
- |
213 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
214 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
215 |
-RESTRICT="strip" # strip ourself #46186 |
216 |
-EMULTILIB_PKG="true" |
217 |
- |
218 |
-# Configuration variables |
219 |
-RELEASE_VER="" |
220 |
-case ${PV} in |
221 |
-9999*) |
222 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
223 |
- EGIT_SOURCEDIRS="${S}" |
224 |
- inherit git-2 |
225 |
- ;; |
226 |
-*) |
227 |
- RELEASE_VER=${PV} |
228 |
- ;; |
229 |
-esac |
230 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
231 |
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/ |
232 |
-PATCH_VER="5" # Gentoo patchset |
233 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
234 |
- |
235 |
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
236 |
- |
237 |
-# Here's how the cross-compile logic breaks down ... |
238 |
-# CTARGET - machine that will target the binaries |
239 |
-# CHOST - machine that will host the binaries |
240 |
-# CBUILD - machine that will build the binaries |
241 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
242 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
243 |
-# CBUILD = CHOST = CTARGET - native build/install |
244 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
245 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
246 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
247 |
-# For install paths: |
248 |
-# CHOST = CTARGET - install into / |
249 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
250 |
- |
251 |
-export CBUILD=${CBUILD:-${CHOST}} |
252 |
-export CTARGET=${CTARGET:-${CHOST}} |
253 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
254 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
255 |
- export CTARGET=${CATEGORY#cross-} |
256 |
- fi |
257 |
-fi |
258 |
- |
259 |
-is_crosscompile() { |
260 |
- [[ ${CHOST} != ${CTARGET} ]] |
261 |
-} |
262 |
- |
263 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
264 |
-# Everyone knows 2.2 > 0, duh. |
265 |
-SLOT="2.2" |
266 |
- |
267 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
268 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
269 |
-COMMON_DEPEND=" |
270 |
- nscd? ( selinux? ( |
271 |
- audit? ( sys-process/audit ) |
272 |
- caps? ( sys-libs/libcap ) |
273 |
- ) ) |
274 |
- suid? ( caps? ( sys-libs/libcap ) ) |
275 |
- selinux? ( sys-libs/libselinux ) |
276 |
-" |
277 |
-DEPEND="${COMMON_DEPEND} |
278 |
- >=app-misc/pax-utils-0.1.10 |
279 |
- !<sys-apps/sandbox-1.6 |
280 |
- !<sys-apps/portage-2.1.2" |
281 |
-RDEPEND="${COMMON_DEPEND} |
282 |
- !sys-kernel/ps3-sources |
283 |
- sys-apps/gentoo-functions |
284 |
- !sys-libs/nss-db" |
285 |
- |
286 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
287 |
- DEPEND+=" !crosscompile_opts_headers-only? ( |
288 |
- >=${CATEGORY}/binutils-2.24 |
289 |
- >=${CATEGORY}/gcc-4.7 |
290 |
- )" |
291 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
292 |
-else |
293 |
- DEPEND+=" |
294 |
- >=sys-devel/binutils-2.24 |
295 |
- >=sys-devel/gcc-4.7 |
296 |
- virtual/os-headers" |
297 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
298 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
299 |
-fi |
300 |
- |
301 |
-upstream_uris() { |
302 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
303 |
-} |
304 |
-gentoo_uris() { |
305 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI" |
306 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
307 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
308 |
-} |
309 |
-SRC_URI=$( |
310 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
311 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
312 |
-) |
313 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
314 |
- |
315 |
-src_unpack() { |
316 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
317 |
- |
318 |
- toolchain-glibc_src_unpack |
319 |
-} |
320 |
- |
321 |
-src_prepare() { |
322 |
- toolchain-glibc_src_prepare |
323 |
- |
324 |
- cd "${S}" |
325 |
- |
326 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
327 |
- |
328 |
- if use hardened ; then |
329 |
- # We don't enable these for non-hardened as the output is very terse -- |
330 |
- # it only states that a crash happened. The default upstream behavior |
331 |
- # includes backtraces and symbols. |
332 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
333 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
334 |
- cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die |
335 |
- |
336 |
- if use debug ; then |
337 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
338 |
- sed -i \ |
339 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
340 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
341 |
- debug/Makefile || die |
342 |
- fi |
343 |
- fi |
344 |
- |
345 |
- case $(gcc-fullversion) in |
346 |
- 4.8.[0-3]|4.9.0) |
347 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
348 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
349 |
- die "need to switch compilers #547420" |
350 |
- ;; |
351 |
- esac |
352 |
-} |
353 |
|
354 |
diff --git a/sys-libs/glibc/glibc-2.25-r3.ebuild b/sys-libs/glibc/glibc-2.25-r3.ebuild |
355 |
deleted file mode 100644 |
356 |
index 3174a4d3611..00000000000 |
357 |
--- a/sys-libs/glibc/glibc-2.25-r3.ebuild |
358 |
+++ /dev/null |
359 |
@@ -1,150 +0,0 @@ |
360 |
-# Copyright 1999-2017 Gentoo Foundation |
361 |
-# Distributed under the terms of the GNU General Public License v2 |
362 |
- |
363 |
-EAPI="5" |
364 |
- |
365 |
-inherit toolchain-glibc |
366 |
- |
367 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
368 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
369 |
- |
370 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
371 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
372 |
-RESTRICT="strip" # strip ourself #46186 |
373 |
-EMULTILIB_PKG="true" |
374 |
- |
375 |
-# Configuration variables |
376 |
-RELEASE_VER="" |
377 |
-case ${PV} in |
378 |
-9999*) |
379 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
380 |
- EGIT_SOURCEDIRS="${S}" |
381 |
- inherit git-2 |
382 |
- ;; |
383 |
-*) |
384 |
- RELEASE_VER=${PV} |
385 |
- ;; |
386 |
-esac |
387 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
388 |
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/ |
389 |
-PATCH_VER="7" # Gentoo patchset |
390 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
391 |
- |
392 |
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" |
393 |
- |
394 |
-# Here's how the cross-compile logic breaks down ... |
395 |
-# CTARGET - machine that will target the binaries |
396 |
-# CHOST - machine that will host the binaries |
397 |
-# CBUILD - machine that will build the binaries |
398 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
399 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
400 |
-# CBUILD = CHOST = CTARGET - native build/install |
401 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
402 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
403 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
404 |
-# For install paths: |
405 |
-# CHOST = CTARGET - install into / |
406 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
407 |
- |
408 |
-export CBUILD=${CBUILD:-${CHOST}} |
409 |
-export CTARGET=${CTARGET:-${CHOST}} |
410 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
411 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
412 |
- export CTARGET=${CATEGORY#cross-} |
413 |
- fi |
414 |
-fi |
415 |
- |
416 |
-is_crosscompile() { |
417 |
- [[ ${CHOST} != ${CTARGET} ]] |
418 |
-} |
419 |
- |
420 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
421 |
-# Everyone knows 2.2 > 0, duh. |
422 |
-SLOT="2.2" |
423 |
- |
424 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
425 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
426 |
-COMMON_DEPEND=" |
427 |
- nscd? ( selinux? ( |
428 |
- audit? ( sys-process/audit ) |
429 |
- caps? ( sys-libs/libcap ) |
430 |
- ) ) |
431 |
- suid? ( caps? ( sys-libs/libcap ) ) |
432 |
- selinux? ( sys-libs/libselinux ) |
433 |
-" |
434 |
-DEPEND="${COMMON_DEPEND} |
435 |
- >=app-misc/pax-utils-0.1.10 |
436 |
- !<sys-apps/sandbox-1.6 |
437 |
- !<sys-apps/portage-2.1.2" |
438 |
-RDEPEND="${COMMON_DEPEND} |
439 |
- !sys-kernel/ps3-sources |
440 |
- sys-apps/gentoo-functions |
441 |
- !sys-libs/nss-db" |
442 |
- |
443 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
444 |
- DEPEND+=" !crosscompile_opts_headers-only? ( |
445 |
- >=${CATEGORY}/binutils-2.24 |
446 |
- >=${CATEGORY}/gcc-4.7 |
447 |
- )" |
448 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
449 |
-else |
450 |
- DEPEND+=" |
451 |
- >=sys-devel/binutils-2.24 |
452 |
- >=sys-devel/gcc-4.7 |
453 |
- virtual/os-headers" |
454 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
455 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
456 |
-fi |
457 |
- |
458 |
-upstream_uris() { |
459 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
460 |
-} |
461 |
-gentoo_uris() { |
462 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" |
463 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
464 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
465 |
-} |
466 |
-SRC_URI=$( |
467 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
468 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
469 |
-) |
470 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
471 |
- |
472 |
-src_unpack() { |
473 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
474 |
- |
475 |
- toolchain-glibc_src_unpack |
476 |
-} |
477 |
- |
478 |
-src_prepare() { |
479 |
- toolchain-glibc_src_prepare |
480 |
- |
481 |
- cd "${S}" |
482 |
- |
483 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
484 |
- |
485 |
- if use hardened ; then |
486 |
- # We don't enable these for non-hardened as the output is very terse -- |
487 |
- # it only states that a crash happened. The default upstream behavior |
488 |
- # includes backtraces and symbols. |
489 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
490 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
491 |
- cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die |
492 |
- |
493 |
- if use debug ; then |
494 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
495 |
- sed -i \ |
496 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
497 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
498 |
- debug/Makefile || die |
499 |
- fi |
500 |
- fi |
501 |
- |
502 |
- case $(gcc-fullversion) in |
503 |
- 4.8.[0-3]|4.9.0) |
504 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
505 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
506 |
- die "need to switch compilers #547420" |
507 |
- ;; |
508 |
- esac |
509 |
-} |