1 |
commit: 8348d46eb06c960586efe184bdf518095f9233f1 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 9 14:18:32 2018 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 9 14:18:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8348d46e |
7 |
|
8 |
sys-libs/glibc: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
12 |
|
13 |
sys-libs/glibc/Manifest | 2 - |
14 |
sys-libs/glibc/glibc-2.20-r2.ebuild | 149 ------------------------------------ |
15 |
2 files changed, 151 deletions(-) |
16 |
|
17 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
18 |
index 73ee7971106..42c459898d3 100644 |
19 |
--- a/sys-libs/glibc/Manifest |
20 |
+++ b/sys-libs/glibc/Manifest |
21 |
@@ -2,8 +2,6 @@ DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 BLAKE2B 3cc5c82cd57d0fbd26d |
22 |
DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908f60d894c6344a2fa09383b30c1633a0682bc668367c8a2f8c6fec2d41b6e2178d709a2bd8db57e8b2ab56ba263c7d56f819c15acd061 SHA512 98c766e913693ab42ff790557acde2a36a8001e2648046a685b21964200df8d4d52d8452d499c0068c6648284d086ce062c2d36e2c6c2fd8aacd232d193f2853 |
23 |
DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e |
24 |
DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d |
25 |
-DIST glibc-2.20-patches-5.tar.bz2 55986 BLAKE2B bad714bd088fb8759ee84d33f22c0bba01a78a401c54828dc413c7ac2a08ae53fba9b07280996e54091f2c918658bb502aeb45f734022c1ab36e1be215381324 SHA512 409f59a028127e02f0c9f91107715b540d8d234475830adc17108a02664be232098d119b43bcc8df9b328ab50c1fffb0868d510e6487ce1c34ec2c7c7a78375b |
26 |
-DIST glibc-2.20.tar.xz 12283992 BLAKE2B f2db06a06e47942e9f5aaad5c4b603d63bb9a3ba624dc1c973e864d65cf893adb7568a18516c0b915b772d2ca30e95899a4d5c03ff9b3ad23e1e276a1d535f39 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa |
27 |
DIST glibc-2.21-patches-7.tar.bz2 46894 BLAKE2B 5a15a3a5ca515351d5d41baaa59ae6b6d1c353f1500c3b8dcd6da895119c89afee9ef6afaa1e7d617f2cf7b7504635e5733429f65847acaa63c0a7bf8233ee9c SHA512 e4cca3d753c0b9d213c0ed85e3d08cbbf6517862b3a48af987e010abaf5a022b47330040ced183d30b5b934de7587e97b4342e51a6df3d5cfa768bdd8b43b756 |
28 |
DIST glibc-2.21.tar.xz 12322092 BLAKE2B 1ce2be09787138262b59b56235e20777459e99861c65694b96f63d7faf24da8655882dd23b39c28a8a2d338c50710f76e1e4dc39a3f4ce9736ef2cbf7f99ed5b SHA512 8cded6693618bec115f678fcbd0b77556f97dfa8337608f66e37224aefa55b38765ba61cb4d58beea37b5934e5ec8e30bad58613707388484906f2a0ce77997d |
29 |
DIST glibc-2.22-patches-13.tar.bz2 74479 BLAKE2B 1ab31614e8334508a63c842f503a395ff3ebeaa33d1890eab1d9e2985cb39064960053f2bbf99ec3bdec0ba5a80d259ca6b964fcaed9d99dcb6da84ddb8dd364 SHA512 73517fc1502b0733d67ade1d1ba6168415f5da64f37045fac0b10ef57155bf6dfbe1876e4742d2543fcea0c935c179426f6fbb94f0205968392ef903d2f83897 |
30 |
|
31 |
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild |
32 |
deleted file mode 100644 |
33 |
index c4a84ff60f6..00000000000 |
34 |
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,149 +0,0 @@ |
37 |
-# Copyright 1999-2018 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI="4" |
41 |
- |
42 |
-inherit toolchain-glibc |
43 |
- |
44 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
45 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
46 |
- |
47 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
48 |
-KEYWORDS="alpha amd64 arm arm64 -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
49 |
-RESTRICT="strip" # strip ourself #46186 |
50 |
-EMULTILIB_PKG="true" |
51 |
- |
52 |
-# Configuration variables |
53 |
-RELEASE_VER="" |
54 |
-case ${PV} in |
55 |
-9999*) |
56 |
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" |
57 |
- inherit git-r3 |
58 |
- ;; |
59 |
-*) |
60 |
- RELEASE_VER=${PV} |
61 |
- ;; |
62 |
-esac |
63 |
-GCC_BOOTSTRAP_VER="4.7.3-r1" |
64 |
-PATCH_VER="5" # Gentoo patchset |
65 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
66 |
- |
67 |
-IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only" |
68 |
- |
69 |
-# Here's how the cross-compile logic breaks down ... |
70 |
-# CTARGET - machine that will target the binaries |
71 |
-# CHOST - machine that will host the binaries |
72 |
-# CBUILD - machine that will build the binaries |
73 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
74 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
75 |
-# CBUILD = CHOST = CTARGET - native build/install |
76 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
77 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
78 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
79 |
-# For install paths: |
80 |
-# CHOST = CTARGET - install into / |
81 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
82 |
- |
83 |
-export CBUILD=${CBUILD:-${CHOST}} |
84 |
-export CTARGET=${CTARGET:-${CHOST}} |
85 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
86 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
87 |
- export CTARGET=${CATEGORY#cross-} |
88 |
- fi |
89 |
-fi |
90 |
- |
91 |
-is_crosscompile() { |
92 |
- [[ ${CHOST} != ${CTARGET} ]] |
93 |
-} |
94 |
- |
95 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
96 |
-# Everyone knows 2.2 > 0, duh. |
97 |
-SLOT="2.2" |
98 |
- |
99 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
100 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
101 |
-DEPEND=">=app-misc/pax-utils-0.1.10 |
102 |
- !<sys-apps/sandbox-1.6 |
103 |
- !<sys-apps/portage-2.1.2 |
104 |
- selinux? ( sys-libs/libselinux )" |
105 |
-RDEPEND="!sys-kernel/ps3-sources |
106 |
- sys-apps/gentoo-functions |
107 |
- selinux? ( sys-libs/libselinux ) |
108 |
- !sys-libs/nss-db" |
109 |
- |
110 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
111 |
- DEPEND+=" !headers-only? ( |
112 |
- >=${CATEGORY}/binutils-2.24 |
113 |
- >=${CATEGORY}/gcc-4.4 |
114 |
- )" |
115 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
116 |
-else |
117 |
- DEPEND+=" |
118 |
- >=sys-devel/binutils-2.24 |
119 |
- >=sys-devel/gcc-4.4 |
120 |
- virtual/os-headers" |
121 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
122 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
123 |
-fi |
124 |
- |
125 |
-upstream_uris() { |
126 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
127 |
-} |
128 |
-gentoo_uris() { |
129 |
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~blueness/glibc/URI" |
130 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
131 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
132 |
-} |
133 |
-SRC_URI=$( |
134 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
135 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
136 |
-) |
137 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
138 |
- |
139 |
-src_unpack() { |
140 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
141 |
- |
142 |
- toolchain-glibc_src_unpack |
143 |
-} |
144 |
- |
145 |
-src_prepare() { |
146 |
- toolchain-glibc_src_prepare |
147 |
- |
148 |
- cd "${S}" |
149 |
- |
150 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
151 |
- |
152 |
- if use hardened ; then |
153 |
- einfo "Patching to get working PIE binaries on PIE (hardened) platforms" |
154 |
- tc-enables-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch |
155 |
- epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch |
156 |
- |
157 |
- # We don't enable these for non-hardened as the output is very terse -- |
158 |
- # it only states that a crash happened. The default upstream behavior |
159 |
- # includes backtraces and symbols. |
160 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
161 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
162 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die |
163 |
- |
164 |
- if use debug ; then |
165 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
166 |
- sed -i \ |
167 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
168 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
169 |
- debug/Makefile || die |
170 |
- fi |
171 |
- |
172 |
- # Build various bits with ssp-all |
173 |
- sed -i \ |
174 |
- -e 's:-fstack-protector$:-fstack-protector-all:' \ |
175 |
- */Makefile || die |
176 |
- fi |
177 |
- |
178 |
- case $(gcc-fullversion) in |
179 |
- 4.8.[0-3]|4.9.0) |
180 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
181 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
182 |
- die "need to switch compilers #547420" |
183 |
- ;; |
184 |
- esac |
185 |
-} |