Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/
Date: Thu, 23 Apr 2020 20:40:00
Message-Id: 1587674382.65bbe6b04a7f9452a06b4fdd377032d560989118.dilfridge@gentoo
1 commit: 65bbe6b04a7f9452a06b4fdd377032d560989118
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 23 20:38:56 2020 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 20:39:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65bbe6b0
7
8 sys-libs/glibc: Remove old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
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.24-r4.ebuild | 173 ------------------------------------
15 2 files changed, 175 deletions(-)
16
17 diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
18 index e0f13392aae..d7c9f2505cf 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.24-patches-10.tar.bz2 73586 BLAKE2B f42cc78b907e7cb5c8ba1672c845cdc0959f4d29f89ff642bd2efa795d7ac69409b514338ac1f4235ce2fbc0c9c9bb2d152f55fd14c02997517dc048a306e1c1 SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca
26 -DIST glibc-2.24.tar.xz 13554048 BLAKE2B 9f93ac00f68eb88e3a2272752624163fac25dd064170e336143aa697908fba2b27ed926582f978da99c6c2489c0ce34d3eb266b5d00be69d27b36126bc2c8efb SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb
27 DIST glibc-2.25-patches-15.tar.bz2 78320 BLAKE2B 70c62cc10db13e2844de4d8a18972e0f4d01ba52fbd40db57c11d7b1c2c0d571b894f01e762bb26632fd696a77c299ef0766e2f129d2eda896f58325a754a13c SHA512 7204218ea82b677e0f278c4752ddb90aa0c08ac2349d061de81ec91dac204b0f10fe223d7b1055b9e0c21dac97c835f913a90c0168a5000d3be00dd20027c185
28 DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1b93e557b6c58129bfb50f863c06f8b49425d75fd2df537dd9c4a68bad790cff770c50a6889732d66f507d349 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e
29 DIST glibc-2.26-patches-7.tar.bz2 413976 BLAKE2B 18263201cf33abf911eb7b802ed539b217391156f897a8db50f65a69627d8f8cceded78414168986ee98eba038364a6b2f3599b23f95e7b0ad2643481c399718 SHA512 0c812a343fcc68c10d92117cb2a0cf1c255470e81f0a7a04d6db2fe35445e410ef37f15162f145c2eb772b08ab55af246f5b52f5e57c2e91038181f6f027abc3
30
31 diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
32 deleted file mode 100644
33 index 567bb161517..00000000000
34 --- a/sys-libs/glibc/glibc-2.24-r4.ebuild
35 +++ /dev/null
36 @@ -1,173 +0,0 @@
37 -# Copyright 1999-2020 Gentoo Authors
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -EAPI="5"
41 -
42 -inherit toolchain-funcs 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 ~sparc ~x86"
49 -EMULTILIB_PKG="true"
50 -
51 -# Configuration variables
52 -RELEASE_VER=""
53 -case ${PV} in
54 -9999*)
55 - EGIT_REPO_URIS="https://sourceware.org/git/glibc.git"
56 - inherit git-r3
57 - ;;
58 -*)
59 - RELEASE_VER=${PV}
60 - ;;
61 -esac
62 -GCC_BOOTSTRAP_VER="4.7.3-r1"
63 -# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
64 -PATCH_VER="10" # Gentoo patchset
65 -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires
66 -
67 -IUSE="audit caps debug gd hardened multilib nscd +rpc 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 -# Note [Disable automatic stripping]
92 -# Disabling automatic stripping for a few reasons:
93 -# - portage's attempt to strip breaks non-native binaries at least on
94 -# arm: bug #697428
95 -# - portage's attempt to strip libpthread.so.0 breaks gdb thread
96 -# enumeration: bug #697910. This is quite subtle:
97 -# * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
98 -# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
99 -# via 'ps_pglobal_lookup' symbol defined in gdb.
100 -# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
101 -# known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
102 -# (unexported) is used to sanity check compatibility before enabling
103 -# debugging.
104 -# 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
105 -# * normal 'strip' command trims '.symtab'
106 -# Thus our main goal here is to prevent 'libpthread.so.0' from
107 -# losing it's '.symtab' entries.
108 -# As Gentoo's strip does not allow us to pass less aggressive stripping
109 -# options and does not check the machine target we disable stripping
110 -# entirely.
111 -RESTRICT=strip
112 -
113 -is_crosscompile() {
114 - [[ ${CHOST} != ${CTARGET} ]]
115 -}
116 -
117 -# Why SLOT 2.2 you ask yourself while sippin your tea ?
118 -# Everyone knows 2.2 > 0, duh.
119 -SLOT="2.2"
120 -
121 -# General: We need a new-enough binutils/gcc to match upstream baseline.
122 -# arch: we need to make sure our binutils/gcc supports TLS.
123 -COMMON_DEPEND="
124 - nscd? ( selinux? (
125 - audit? ( sys-process/audit )
126 - caps? ( sys-libs/libcap )
127 - ) )
128 - suid? ( caps? ( sys-libs/libcap ) )
129 - selinux? ( sys-libs/libselinux )
130 -"
131 -DEPEND="${COMMON_DEPEND}
132 - >=app-misc/pax-utils-0.1.10
133 -"
134 -RDEPEND="${COMMON_DEPEND}
135 - sys-apps/gentoo-functions
136 -"
137 -
138 -if [[ ${CATEGORY} == cross-* ]] ; then
139 - DEPEND+=" !headers-only? (
140 - >=${CATEGORY}/binutils-2.24
141 - >=${CATEGORY}/gcc-4.7
142 - )"
143 - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
144 -else
145 - DEPEND+="
146 - >=sys-devel/binutils-2.24
147 - >=sys-devel/gcc-4.7
148 - virtual/os-headers"
149 - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
150 - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
151 -fi
152 -
153 -upstream_uris() {
154 - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
155 -}
156 -gentoo_uris() {
157 - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
158 - devspace=${devspace//HTTP/https://dev.gentoo.org/}
159 - echo mirror://gentoo/$1 ${devspace//URI/$1}
160 -}
161 -SRC_URI=$(
162 - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
163 - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
164 -)
165 -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
166 -
167 -src_unpack() {
168 - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
169 -
170 - toolchain-glibc_src_unpack
171 -}
172 -
173 -src_prepare() {
174 - toolchain-glibc_src_prepare
175 -
176 - cd "${S}"
177 -
178 - epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
179 -
180 - if use hardened ; then
181 - # We don't enable these for non-hardened as the output is very terse --
182 - # it only states that a crash happened. The default upstream behavior
183 - # includes backtraces and symbols.
184 - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
185 - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
186 - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
187 -
188 - if use debug ; then
189 - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
190 - sed -i \
191 - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
192 - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
193 - debug/Makefile || die
194 - fi
195 -
196 - # Build various bits with ssp-all
197 - sed -i \
198 - -e 's:-fstack-protector$:-fstack-protector-all:' \
199 - */Makefile || die
200 - fi
201 -
202 - case $(gcc-fullversion) in
203 - 4.8.[0-3]|4.9.0)
204 - eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
205 - eerror "glibc. See https://bugs.gentoo.org/547420 for details."
206 - die "need to switch compilers #547420"
207 - ;;
208 - esac
209 -}