1 |
commit: 486b77ab8d28c5bfd5a4bdfc5f9a5f432ffde563 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 2 15:25:43 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 2 15:26:17 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486b77ab |
7 |
|
8 |
sys-libs/glibc: Drop old 2.25 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org> |
12 |
|
13 |
sys-libs/glibc/Manifest | 2 - |
14 |
sys-libs/glibc/glibc-2.25-r11.ebuild | 170 ----------------------------------- |
15 |
sys-libs/glibc/metadata.xml | 1 - |
16 |
3 files changed, 173 deletions(-) |
17 |
|
18 |
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest |
19 |
index 6c1d47a0bae..f0552009708 100644 |
20 |
--- a/sys-libs/glibc/Manifest |
21 |
+++ b/sys-libs/glibc/Manifest |
22 |
@@ -4,8 +4,6 @@ DIST gcc-multilib-bootstrap-20180511.tar.xz 2392908 BLAKE2B f3cf614399368acd8908 |
23 |
DIST gcc-multilib-bootstrap-20201208.tar.xz 5528452 BLAKE2B 16699a6e4df5b2f28a21776ae9e3728b26a9ea251f5580aa5349545ad7c9f6145b9cb6a12ca8f5f96b9cb2a3c70b7e66ca702e4c6f083ac00408e0a20a69e613 SHA512 a243f505e17d0a7e144e8713c077582412f61d6cf7f79baa846de4fb77f5e0f27e11c9a785e14624e04ac52287b32164e7995323aa11caef59113ac438254347 |
24 |
DIST glibc-2.19-patches-9.tar.bz2 24584 BLAKE2B a96e930a5bd20fa75d9f259cc2117fa5ce98072274a24a5823bf877e3739fa4c001a94d7865e065ee0527f3974430d27da8038e042340a451ad2052c62724f26 SHA512 a95b3063ade974a3556480b798b317d33c7423a8cb9e69f67249ffb8b3d3c671d70d2d5f782c1efadc0bec4cc49a96d4fe89911f3dfcd85b459f69f3b4f38f0e |
25 |
DIST glibc-2.19.tar.xz 12083312 BLAKE2B 9dc03346e0f0df4bf009a92d894b0a9f964ff92b7f4c9663cedf1cb6cf90435f28a15539d33791ecf43ee578fa4e26f916af0367651312ef8f9c1c38ce0dafa2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d |
26 |
-DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185 |
27 |
-DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e |
28 |
DIST glibc-2.30-patches-10.tar.xz 72808 BLAKE2B a7a95c99482524b2896d15539766f1e6b1fe34a22f32119248c6dd44f42632076e86fdcbbdc2d604ec73ceccdd8a7f5936a62a6f4c3d039fae8f6901dfc6be77 SHA512 af5e213ff08bf38f6f529816c36b4e38df27207c2df254609ebe45b2f039ab553bbe563aa6f64b6667d328fd2c120dc21b6e2676540bdd94e58079237089eac3 |
29 |
DIST glibc-2.30-sparc-reg-fix-clobber.patch 6106 BLAKE2B cad6a4cbef5d529519ef486f4ef8e189cb4d43dd67fa8f8d50d67072cbb682f60474d482a5c5152d1317de92b98851d8a88eee6b331eb5bc22de065c03c58fde SHA512 a018ef1f196257f3888af20a5cbc97892c8382a4f489da042568e087c077f30cf4dda6ac711b573e1274317866ce97cf817d92a28cf55f18f5e8d32787e6cb3f |
30 |
DIST glibc-2.30.tar.xz 16576920 BLAKE2B bd5aae4c9854f40785b91f83c3b632de6d48d811027ddfe61651cb1bc617db8017d7914c23a770cdd3feed06fcc316da841eea916cdba54179e7eace4ea45484 SHA512 37483990cd653685873e96c45dd1651b32b441b6d7919a68ebe3bae31a0c3f7ce183fc9b110f0b268b353f80312f18370559a1e7aecea0e5aa755c8f2aef1d6b |
31 |
|
32 |
diff --git a/sys-libs/glibc/glibc-2.25-r11.ebuild b/sys-libs/glibc/glibc-2.25-r11.ebuild |
33 |
deleted file mode 100644 |
34 |
index 145e3601f82..00000000000 |
35 |
--- a/sys-libs/glibc/glibc-2.25-r11.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,170 +0,0 @@ |
38 |
-# Copyright 1999-2021 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI="5" |
42 |
- |
43 |
-inherit epatch toolchain-funcs toolchain-glibc |
44 |
- |
45 |
-DESCRIPTION="GNU libc6 (also called glibc2) C library" |
46 |
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html" |
47 |
- |
48 |
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" |
49 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" |
50 |
-EMULTILIB_PKG="true" |
51 |
- |
52 |
-# Configuration variables |
53 |
-RELEASE_VER="" |
54 |
-case ${PV} in |
55 |
-9999*) |
56 |
- EGIT_REPO_URIS="https://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 |
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/ |
65 |
-PATCH_VER="15" # Gentoo patchset |
66 |
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires |
67 |
- |
68 |
-GLIBC_PATCH_EXCLUDE+=" 0005_all_sys-types.h-drop-sys-sysmacros.h-include.patch" |
69 |
- |
70 |
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla headers-only" |
71 |
- |
72 |
-# Here's how the cross-compile logic breaks down ... |
73 |
-# CTARGET - machine that will target the binaries |
74 |
-# CHOST - machine that will host the binaries |
75 |
-# CBUILD - machine that will build the binaries |
76 |
-# If CTARGET != CHOST, it means you want a libc for cross-compiling. |
77 |
-# If CHOST != CBUILD, it means you want to cross-compile the libc. |
78 |
-# CBUILD = CHOST = CTARGET - native build/install |
79 |
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build |
80 |
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler |
81 |
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler |
82 |
-# For install paths: |
83 |
-# CHOST = CTARGET - install into / |
84 |
-# CHOST != CTARGET - install into /usr/CTARGET/ |
85 |
- |
86 |
-export CBUILD=${CBUILD:-${CHOST}} |
87 |
-export CTARGET=${CTARGET:-${CHOST}} |
88 |
-if [[ ${CTARGET} == ${CHOST} ]] ; then |
89 |
- if [[ ${CATEGORY} == cross-* ]] ; then |
90 |
- export CTARGET=${CATEGORY#cross-} |
91 |
- fi |
92 |
-fi |
93 |
- |
94 |
-# Note [Disable automatic stripping] |
95 |
-# Disabling automatic stripping for a few reasons: |
96 |
-# - portage's attempt to strip breaks non-native binaries at least on |
97 |
-# arm: bug #697428 |
98 |
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread |
99 |
-# enumeration: bug #697910. This is quite subtle: |
100 |
-# * gdb uses glibc's libthread_db-1.0.so to enumerate threads. |
101 |
-# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols |
102 |
-# via 'ps_pglobal_lookup' symbol defined in gdb. |
103 |
-# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all |
104 |
-# known symbols in 'libpthread.so.0'. Specifically 'nptl_version' |
105 |
-# (unexported) is used to sanity check compatibility before enabling |
106 |
-# debugging. |
107 |
-# Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint |
108 |
-# * normal 'strip' command trims '.symtab' |
109 |
-# Thus our main goal here is to prevent 'libpthread.so.0' from |
110 |
-# losing it's '.symtab' entries. |
111 |
-# As Gentoo's strip does not allow us to pass less aggressive stripping |
112 |
-# options and does not check the machine target we disable stripping |
113 |
-# entirely. |
114 |
-RESTRICT=strip |
115 |
- |
116 |
-is_crosscompile() { |
117 |
- [[ ${CHOST} != ${CTARGET} ]] |
118 |
-} |
119 |
- |
120 |
-# Why SLOT 2.2 you ask yourself while sippin your tea ? |
121 |
-# Everyone knows 2.2 > 0, duh. |
122 |
-SLOT="2.2" |
123 |
- |
124 |
-# General: We need a new-enough binutils/gcc to match upstream baseline. |
125 |
-# arch: we need to make sure our binutils/gcc supports TLS. |
126 |
-COMMON_DEPEND=" |
127 |
- nscd? ( selinux? ( |
128 |
- audit? ( sys-process/audit ) |
129 |
- caps? ( sys-libs/libcap ) |
130 |
- ) ) |
131 |
- suid? ( caps? ( sys-libs/libcap ) ) |
132 |
- selinux? ( sys-libs/libselinux ) |
133 |
- systemtap? ( dev-util/systemtap ) |
134 |
-" |
135 |
-DEPEND="${COMMON_DEPEND} |
136 |
- >=app-misc/pax-utils-0.1.10 |
137 |
-" |
138 |
-RDEPEND="${COMMON_DEPEND} |
139 |
- sys-apps/gentoo-functions" |
140 |
- |
141 |
-if [[ ${CATEGORY} == cross-* ]] ; then |
142 |
- DEPEND+=" !headers-only? ( |
143 |
- >=${CATEGORY}/binutils-2.24 |
144 |
- >=${CATEGORY}/gcc-4.7 |
145 |
- )" |
146 |
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
147 |
-else |
148 |
- DEPEND+=" |
149 |
- >=sys-devel/binutils-2.24 |
150 |
- >=sys-devel/gcc-4.7 |
151 |
- virtual/os-headers" |
152 |
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" |
153 |
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" |
154 |
-fi |
155 |
- |
156 |
-upstream_uris() { |
157 |
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 |
158 |
-} |
159 |
-gentoo_uris() { |
160 |
- local devspace="HTTP~vapier/dist/URI HTTP~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI" |
161 |
- devspace=${devspace//HTTP/https://dev.gentoo.org/} |
162 |
- echo mirror://gentoo/$1 ${devspace//URI/$1} |
163 |
-} |
164 |
-SRC_URI=$( |
165 |
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz |
166 |
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 |
167 |
-) |
168 |
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" |
169 |
- |
170 |
-src_unpack() { |
171 |
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 |
172 |
- |
173 |
- toolchain-glibc_src_unpack |
174 |
-} |
175 |
- |
176 |
-src_prepare() { |
177 |
- toolchain-glibc_src_prepare |
178 |
- |
179 |
- cd "${S}" |
180 |
- |
181 |
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 |
182 |
- |
183 |
- if use hardened ; then |
184 |
- # We don't enable these for non-hardened as the output is very terse -- |
185 |
- # it only states that a crash happened. The default upstream behavior |
186 |
- # includes backtraces and symbols. |
187 |
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" |
188 |
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die |
189 |
- cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die |
190 |
- |
191 |
- if use debug ; then |
192 |
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. |
193 |
- sed -i \ |
194 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
195 |
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ |
196 |
- debug/Makefile || die |
197 |
- fi |
198 |
- fi |
199 |
- |
200 |
- case $(gcc-fullversion) in |
201 |
- 4.8.[0-3]|4.9.0) |
202 |
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" |
203 |
- eerror "glibc. See https://bugs.gentoo.org/547420 for details." |
204 |
- die "need to switch compilers #547420" |
205 |
- ;; |
206 |
- esac |
207 |
-} |
208 |
|
209 |
diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml |
210 |
index 7dc64b63dde..46756d4a46e 100644 |
211 |
--- a/sys-libs/glibc/metadata.xml |
212 |
+++ b/sys-libs/glibc/metadata.xml |
213 |
@@ -14,7 +14,6 @@ |
214 |
<flag name="multiarch">enable optimizations for multiple CPU architectures (detected at runtime)</flag> |
215 |
<flag name="multilib-bootstrap">Provide prebuilt libgcc.a and crt files if missing. Only needed for ABI switch.</flag> |
216 |
<flag name="nscd">Build, and enable support for, the Name Service Cache Daemon</flag> |
217 |
- <flag name="rpc">Enable obsolete RPC/NIS layers</flag> |
218 |
<flag name="ssp">protect stack of glibc internals</flag> |
219 |
<flag name="static-pie">Enable static PIE support (runtime files for -static-pie gcc option).</flag> |
220 |
<flag name="suid">Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5</flag> |