mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
sys-libs/glibc: drop prepallstrip, bug #587296
Stop using internal portage's 'prepallstrip' helper. This effectively reverts https://bugs.gentoo.org/46186. Modern gdb can inspect threads without debugging symbols in libpthread/libthread_db. Reported-by: Michał Górny Closes: https://bugs.gentoo.org/587296 Bug: https://bugs.gentoo.org/46186 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
@@ -9,7 +9,6 @@ inherit prefix eutils toolchain-funcs flag-o-matic gnuconfig usr-ldscript \
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1197,23 +1196,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1222,7 +1204,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
@@ -10,7 +10,6 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
|
||||
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
RESTRICT="strip" # strip ourself #46186
|
||||
EMULTILIB_PKG="true"
|
||||
|
||||
# Configuration variables
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="5"
|
||||
@@ -10,7 +10,6 @@ HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
|
||||
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
|
||||
RESTRICT="strip" # strip ourself #46186
|
||||
EMULTILIB_PKG="true"
|
||||
|
||||
# Configuration variables
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
@@ -9,7 +9,6 @@ DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
EMULTILIB_PKG="true"
|
||||
|
||||
# Configuration variables
|
||||
@@ -784,7 +783,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
|
||||
@@ -9,7 +9,6 @@ inherit prefix eutils versionator toolchain-funcs flag-o-matic gnuconfig usr-lds
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1303,23 +1302,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1328,7 +1310,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -9,7 +9,6 @@ inherit prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig usr-ldscr
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1301,23 +1300,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1326,7 +1308,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1343,23 +1342,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1368,7 +1350,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1356,23 +1355,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1381,7 +1363,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1356,23 +1355,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1381,7 +1363,6 @@ src_install() {
|
||||
fi
|
||||
|
||||
foreach_abi glibc_do_src_install
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1363,23 +1362,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1393,8 +1375,6 @@ src_install() {
|
||||
elog "Not installing static glibc libraries"
|
||||
find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
|
||||
fi
|
||||
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -11,7 +11,6 @@ inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuco
|
||||
DESCRIPTION="GNU libc C library"
|
||||
HOMEPAGE="https://www.gnu.org/software/libc/"
|
||||
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
|
||||
RESTRICT="strip" # Strip ourself #46186
|
||||
SLOT="2.2"
|
||||
|
||||
EMULTILIB_PKG="true"
|
||||
@@ -1363,23 +1362,6 @@ glibc_headers_install() {
|
||||
dosym usr/include $(alt_prefix)/sys-include
|
||||
}
|
||||
|
||||
src_strip() {
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread, so we need to strip it by hand. libthread_db makes no
|
||||
# sense stripped as it is only used when debugging.
|
||||
local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}")
|
||||
env \
|
||||
-uRESTRICT \
|
||||
CHOST=${CTARGET} \
|
||||
STRIP_MASK="/*/{,tls/}${pthread}*" \
|
||||
prepallstrip
|
||||
# if user has stripping enabled and does not have split debug turned on,
|
||||
# then leave the debugging sections in libpthread.
|
||||
if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then
|
||||
${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"$(alt_prefix)/*/libpthread-*.so
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if just_headers ; then
|
||||
export ABI=default
|
||||
@@ -1393,8 +1375,6 @@ src_install() {
|
||||
elog "Not installing static glibc libraries"
|
||||
find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
|
||||
fi
|
||||
|
||||
src_strip
|
||||
}
|
||||
|
||||
# Simple test to make sure our new glibc isn't completely broken.
|
||||
|
||||
@@ -1181,11 +1181,6 @@ glibc_do_src_install() {
|
||||
# '#define VERSION "2.26.90"' -> '2.26.90'
|
||||
local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
|
||||
|
||||
# gdb is lame and requires some debugging information to remain in
|
||||
# libpthread. libthread_db makes no sense stripped as it is only used when debugging.
|
||||
dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
|
||||
dostrip -x $(alt_libdir)/libthread_db-1.0.so
|
||||
|
||||
if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
|
||||
# Move versioned .a file out of libdir to evade portage QA checks
|
||||
# instead of using gen_usr_ldscript(). We fix ldscript as:
|
||||
|
||||
Reference in New Issue
Block a user