|
|
|
|
@ -1,16 +1,17 @@
|
|
|
|
|
# Copyright 1999-2020 Gentoo Authors
|
|
|
|
|
# Copyright 1999-2019 Gentoo Authors
|
|
|
|
|
# Distributed under the terms of the GNU General Public License v2
|
|
|
|
|
|
|
|
|
|
EAPI=7
|
|
|
|
|
EAPI=6
|
|
|
|
|
|
|
|
|
|
PYTHON_COMPAT=( python3_{6,7} )
|
|
|
|
|
PYTHON_COMPAT=( python3_{5,6,7} )
|
|
|
|
|
|
|
|
|
|
inherit python-any-r1 prefix eutils toolchain-funcs flag-o-matic gnuconfig \
|
|
|
|
|
inherit python-any-r1 prefix eutils eapi7-ver toolchain-funcs flag-o-matic gnuconfig \
|
|
|
|
|
multilib systemd multiprocessing
|
|
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
@ -19,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then
|
|
|
|
|
EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
|
|
|
|
|
inherit git-r3
|
|
|
|
|
else
|
|
|
|
|
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
|
|
|
|
|
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
|
|
|
|
|
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@ -28,13 +29,12 @@ RELEASE_VER=${PV}
|
|
|
|
|
GCC_BOOTSTRAP_VER=20180511
|
|
|
|
|
|
|
|
|
|
# Gentoo patchset
|
|
|
|
|
PATCH_VER=10
|
|
|
|
|
PATCH_DEV=dilfridge
|
|
|
|
|
PATCH_VER=3
|
|
|
|
|
|
|
|
|
|
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
|
|
|
|
|
SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
|
|
|
|
|
SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
|
|
|
|
|
|
|
|
|
|
IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
|
|
|
|
|
IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla"
|
|
|
|
|
|
|
|
|
|
# Minimum kernel version that glibc requires
|
|
|
|
|
MIN_KERN_VER="3.2.0"
|
|
|
|
|
@ -61,38 +61,10 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Note [Disable automatic stripping]
|
|
|
|
|
# Disabling automatic stripping for a few reasons:
|
|
|
|
|
# - portage's attempt to strip breaks non-native binaries at least on
|
|
|
|
|
# arm: bug #697428
|
|
|
|
|
# - portage's attempt to strip libpthread.so.0 breaks gdb thread
|
|
|
|
|
# enumeration: bug #697910. This is quite subtle:
|
|
|
|
|
# * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
|
|
|
|
|
# * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
|
|
|
|
|
# via 'ps_pglobal_lookup' symbol defined in gdb.
|
|
|
|
|
# * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
|
|
|
|
|
# known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
|
|
|
|
|
# (unexported) is used to sanity check compatibility before enabling
|
|
|
|
|
# debugging.
|
|
|
|
|
# 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
|
|
|
|
|
# * normal 'strip' command trims '.symtab'
|
|
|
|
|
# Thus our main goal here is to prevent 'libpthread.so.0' from
|
|
|
|
|
# losing it's '.symtab' entries.
|
|
|
|
|
# As Gentoo's strip does not allow us to pass less aggressive stripping
|
|
|
|
|
# options and does not check the machine target we strip selectively.
|
|
|
|
|
|
|
|
|
|
# We need a new-enough binutils/gcc to match upstream baseline.
|
|
|
|
|
# Also we need to make sure our binutils/gcc supports TLS,
|
|
|
|
|
# and that gcc already contains the hardened patches.
|
|
|
|
|
BDEPEND="
|
|
|
|
|
${PYTHON_DEPS}
|
|
|
|
|
>=app-misc/pax-utils-0.1.10
|
|
|
|
|
sys-devel/bison
|
|
|
|
|
!<sys-devel/bison-2.7
|
|
|
|
|
doc? ( sys-apps/texinfo )
|
|
|
|
|
"
|
|
|
|
|
COMMON_DEPEND="
|
|
|
|
|
gd? ( media-libs/gd:2= )
|
|
|
|
|
nscd? ( selinux? (
|
|
|
|
|
audit? ( sys-process/audit )
|
|
|
|
|
caps? ( sys-libs/libcap )
|
|
|
|
|
@ -102,66 +74,40 @@ COMMON_DEPEND="
|
|
|
|
|
systemtap? ( dev-util/systemtap )
|
|
|
|
|
"
|
|
|
|
|
DEPEND="${COMMON_DEPEND}
|
|
|
|
|
test? ( >=net-dns/libidn2-2.3.0 )
|
|
|
|
|
${PYTHON_DEPS}
|
|
|
|
|
>=app-misc/pax-utils-0.1.10
|
|
|
|
|
sys-devel/bison
|
|
|
|
|
!<sys-apps/sandbox-1.6
|
|
|
|
|
!<sys-apps/portage-2.1.2
|
|
|
|
|
!<sys-devel/bison-2.7
|
|
|
|
|
!<sys-devel/make-4
|
|
|
|
|
doc? ( sys-apps/texinfo )
|
|
|
|
|
test? ( >=net-dns/libidn2-2.0.5 )
|
|
|
|
|
"
|
|
|
|
|
RDEPEND="${COMMON_DEPEND}
|
|
|
|
|
sys-apps/gentoo-functions
|
|
|
|
|
!sys-kernel/ps3-sources
|
|
|
|
|
!sys-libs/nss-db
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
RESTRICT="!test? ( test )"
|
|
|
|
|
|
|
|
|
|
if [[ ${CATEGORY} == cross-* ]] ; then
|
|
|
|
|
BDEPEND+=" !headers-only? (
|
|
|
|
|
DEPEND+=" !headers-only? (
|
|
|
|
|
>=${CATEGORY}/binutils-2.24
|
|
|
|
|
>=${CATEGORY}/gcc-6
|
|
|
|
|
)"
|
|
|
|
|
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
|
|
|
|
|
else
|
|
|
|
|
BDEPEND+="
|
|
|
|
|
DEPEND+="
|
|
|
|
|
>=sys-devel/binutils-2.24
|
|
|
|
|
>=sys-devel/gcc-6
|
|
|
|
|
virtual/os-headers
|
|
|
|
|
"
|
|
|
|
|
DEPEND+=" virtual/os-headers "
|
|
|
|
|
RDEPEND+="
|
|
|
|
|
>=net-dns/libidn2-2.3.0
|
|
|
|
|
vanilla? ( !sys-libs/timezone-data )
|
|
|
|
|
"
|
|
|
|
|
PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Ignore tests whitelisted below
|
|
|
|
|
GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
|
|
|
|
|
|
|
|
|
|
# The following tests fail due to the Gentoo build system and are thus
|
|
|
|
|
# executed but ignored:
|
|
|
|
|
XFAIL_TEST_LIST=(
|
|
|
|
|
# 1) Sandbox
|
|
|
|
|
tst-ldconfig-bad-aux-cache
|
|
|
|
|
tst-pldd
|
|
|
|
|
tst-mallocfork2
|
|
|
|
|
tst-nss-db-endgrent
|
|
|
|
|
tst-nss-db-endpwent
|
|
|
|
|
tst-nss-files-hosts-long
|
|
|
|
|
tst-nss-test3
|
|
|
|
|
# 2) Namespaces and cgroup
|
|
|
|
|
tst-locale-locpath
|
|
|
|
|
# 9) Failures of unknown origin
|
|
|
|
|
tst-latepthread
|
|
|
|
|
|
|
|
|
|
# buggy test, fixed in glibc-2.31 in 70ba28f7ab29
|
|
|
|
|
tst-pkey
|
|
|
|
|
|
|
|
|
|
# buggy test, assumes /dev/ and /dev/null on a single filesystem
|
|
|
|
|
# 'mount --bind /dev/null /chroot/dev/null' breaks it.
|
|
|
|
|
# https://sourceware.org/PR25909
|
|
|
|
|
tst-support_descriptors
|
|
|
|
|
|
|
|
|
|
# Flaky test, known to fail occasionally:
|
|
|
|
|
# https://sourceware.org/PR19329
|
|
|
|
|
# https://bugs.gentoo.org/719674#c12
|
|
|
|
|
tst-stack4
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Small helper functions
|
|
|
|
|
#
|
|
|
|
|
@ -178,18 +124,6 @@ alt_prefix() {
|
|
|
|
|
is_crosscompile && echo /usr/${CTARGET}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# This prefix is applicable to CHOST when building against this
|
|
|
|
|
# glibc. It is baked into the library at configure time.
|
|
|
|
|
host_eprefix() {
|
|
|
|
|
is_crosscompile || echo "${EPREFIX}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# This prefix is applicable to CBUILD when building against this
|
|
|
|
|
# glibc. It determines the destination path at install time.
|
|
|
|
|
build_eprefix() {
|
|
|
|
|
is_crosscompile && echo "${EPREFIX}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# We need to be able to set alternative headers for compiling for non-native
|
|
|
|
|
# platform. Will also become useful for testing kernel-headers without screwing
|
|
|
|
|
# up the whole system.
|
|
|
|
|
@ -199,7 +133,7 @@ alt_headers() {
|
|
|
|
|
|
|
|
|
|
alt_build_headers() {
|
|
|
|
|
if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
|
|
|
|
|
ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
|
|
|
|
|
ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)"
|
|
|
|
|
if tc-is-cross-compiler ; then
|
|
|
|
|
ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
|
|
|
|
|
if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
|
|
|
|
|
@ -232,7 +166,7 @@ do_compile_test() {
|
|
|
|
|
rm -f glibc-test*
|
|
|
|
|
printf '%b' "$*" > glibc-test.c
|
|
|
|
|
|
|
|
|
|
nonfatal emake glibc-test
|
|
|
|
|
nonfatal emake -s glibc-test
|
|
|
|
|
ret=$?
|
|
|
|
|
|
|
|
|
|
popd >/dev/null
|
|
|
|
|
@ -280,7 +214,7 @@ setup_target_flags() {
|
|
|
|
|
# We could change main to _start and pass -nostdlib here so that we
|
|
|
|
|
# only test the gcc code compilation. Or we could do a compile and
|
|
|
|
|
# then look for the symbol via scanelf.
|
|
|
|
|
if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
|
|
|
|
|
if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
|
|
|
|
|
local t=${CTARGET_OPT:-${CTARGET}}
|
|
|
|
|
t=${t%%-*}
|
|
|
|
|
filter-flags '-march=*'
|
|
|
|
|
@ -290,9 +224,10 @@ setup_target_flags() {
|
|
|
|
|
;;
|
|
|
|
|
amd64)
|
|
|
|
|
# -march needed for #185404 #199334
|
|
|
|
|
# Note: This test only matters when the x86 ABI is enabled, so we could
|
|
|
|
|
# optimize a bit and elide it.
|
|
|
|
|
# TODO: See cross-compile issues listed above for x86.
|
|
|
|
|
[[ ${ABI} == x86 ]] &&
|
|
|
|
|
if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
|
|
|
|
|
if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
|
|
|
|
|
local t=${CTARGET_OPT:-${CTARGET}}
|
|
|
|
|
t=${t%%-*}
|
|
|
|
|
# Normally the target is x86_64-xxx, so turn that into the -march that
|
|
|
|
|
@ -302,15 +237,9 @@ setup_target_flags() {
|
|
|
|
|
# ugly, ugly, ugly. ugly.
|
|
|
|
|
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
|
|
|
|
|
export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
|
|
|
|
|
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
|
|
|
|
|
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
ia64)
|
|
|
|
|
# Workaround GPREL22 overflow by slightly pessimizing global
|
|
|
|
|
# references to go via 64-bit relocations instead of 22-bit ones.
|
|
|
|
|
# This allows building glibc on ia64 without an overflow: #723268
|
|
|
|
|
append-flags -fcommon
|
|
|
|
|
;;
|
|
|
|
|
mips)
|
|
|
|
|
# The mips abi cannot support the GNU style hashes. #233233
|
|
|
|
|
filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
|
|
|
|
|
@ -320,27 +249,77 @@ setup_target_flags() {
|
|
|
|
|
filter-flags "-fcall-used-g7"
|
|
|
|
|
append-flags "-fcall-used-g6"
|
|
|
|
|
|
|
|
|
|
# If the CHOST is the basic one (e.g. not sparcv9-xxx already),
|
|
|
|
|
# try to pick a better one so glibc can use cpu-specific .S files.
|
|
|
|
|
# We key off the CFLAGS to get a good value. Also need to handle
|
|
|
|
|
# version skew.
|
|
|
|
|
# We can't force users to set their CHOST to their exact machine
|
|
|
|
|
# as many of these are not recognized by config.sub/gcc and such :(.
|
|
|
|
|
# Note: If the mcpu values don't scale, we might try probing CPP defines.
|
|
|
|
|
# Note: Should we factor in -Wa,-AvXXX flags too ? Or -mvis/etc... ?
|
|
|
|
|
|
|
|
|
|
local cpu
|
|
|
|
|
case ${CTARGET} in
|
|
|
|
|
sparc64-*)
|
|
|
|
|
cpu="sparc64"
|
|
|
|
|
case $(get-flag mcpu) in
|
|
|
|
|
v9)
|
|
|
|
|
niagara[234])
|
|
|
|
|
if ver_test -ge 2.8 ; then
|
|
|
|
|
cpu="sparc64v2"
|
|
|
|
|
elif ver_test -ge 2.4 ; then
|
|
|
|
|
cpu="sparc64v"
|
|
|
|
|
elif ver_test -ge 2.2.3 ; then
|
|
|
|
|
cpu="sparc64b"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
niagara)
|
|
|
|
|
if ver_test -ge 2.4 ; then
|
|
|
|
|
cpu="sparc64v"
|
|
|
|
|
elif ver_test -ge 2.2.3 ; then
|
|
|
|
|
cpu="sparc64b"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
ultrasparc3)
|
|
|
|
|
cpu="sparc64b"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# We need to force at least v9a because the base build doesn't
|
|
|
|
|
# work with just v9.
|
|
|
|
|
# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
|
|
|
|
|
append-flags "-Wa,-xarch=v9a"
|
|
|
|
|
[[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
;;
|
|
|
|
|
sparc-*)
|
|
|
|
|
case $(get-flag mcpu) in
|
|
|
|
|
niagara[234])
|
|
|
|
|
if ver_test -ge 2.8 ; then
|
|
|
|
|
cpu="sparcv9v2"
|
|
|
|
|
elif ver_test -ge 2.4 ; then
|
|
|
|
|
cpu="sparcv9v"
|
|
|
|
|
elif ver_test -ge 2.2.3 ; then
|
|
|
|
|
cpu="sparcv9b"
|
|
|
|
|
else
|
|
|
|
|
cpu="sparcv9"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
niagara)
|
|
|
|
|
if ver_test -ge 2.4 ; then
|
|
|
|
|
cpu="sparcv9v"
|
|
|
|
|
elif ver_test -ge 2.2.3 ; then
|
|
|
|
|
cpu="sparcv9b"
|
|
|
|
|
else
|
|
|
|
|
cpu="sparcv9"
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
ultrasparc3)
|
|
|
|
|
cpu="sparcv9b"
|
|
|
|
|
;;
|
|
|
|
|
v9|ultrasparc)
|
|
|
|
|
cpu="sparcv9"
|
|
|
|
|
;;
|
|
|
|
|
v8|supersparc|hypersparc|leon|leon3)
|
|
|
|
|
cpu="sparcv8"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
cpu="sparcv9"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
@ -364,18 +343,11 @@ setup_flags() {
|
|
|
|
|
ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
|
|
|
|
|
ASFLAGS=${ASFLAGS_BASE}
|
|
|
|
|
|
|
|
|
|
# Allow users to explicitly avoid flag sanitization via
|
|
|
|
|
# USE=custom-cflags.
|
|
|
|
|
if ! use custom-cflags; then
|
|
|
|
|
# Over-zealous CFLAGS can often cause problems. What may work for one
|
|
|
|
|
# person may not work for another. To avoid a large influx of bugs
|
|
|
|
|
# relating to failed builds, we strip most CFLAGS out to ensure as few
|
|
|
|
|
# problems as possible.
|
|
|
|
|
strip-flags
|
|
|
|
|
# Lock glibc at -O2; we want to be conservative here.
|
|
|
|
|
filter-flags '-O?'
|
|
|
|
|
append-flags -O2
|
|
|
|
|
fi
|
|
|
|
|
# Over-zealous CFLAGS can often cause problems. What may work for one
|
|
|
|
|
# person may not work for another. To avoid a large influx of bugs
|
|
|
|
|
# relating to failed builds, we strip most CFLAGS out to ensure as few
|
|
|
|
|
# problems as possible.
|
|
|
|
|
strip-flags
|
|
|
|
|
strip-unsupported-flags
|
|
|
|
|
filter-flags -m32 -m64 '-mabi=*'
|
|
|
|
|
|
|
|
|
|
@ -397,9 +369,10 @@ setup_flags() {
|
|
|
|
|
CBUILD_OPT=${CTARGET_OPT}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# glibc's headers disallow -O0 and fail at build time:
|
|
|
|
|
# include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
|
|
|
|
|
replace-flags -O0 -O1
|
|
|
|
|
# Lock glibc at -O2; we want to be conservative here.
|
|
|
|
|
# -fno-strict-aliasing is to work around #155906.
|
|
|
|
|
filter-flags '-O?'
|
|
|
|
|
append-flags -O2 -fno-strict-aliasing
|
|
|
|
|
|
|
|
|
|
filter-flags '-fstack-protector*'
|
|
|
|
|
}
|
|
|
|
|
@ -491,7 +464,7 @@ setup_env() {
|
|
|
|
|
# configure script checks CFLAGS for some targets (like mips). Keep
|
|
|
|
|
# around the original clean value to avoid appending multiple ABIs on
|
|
|
|
|
# top of each other.
|
|
|
|
|
: ${__GLIBC_CC:=$(tc-getCC ${CTARGET})}
|
|
|
|
|
: ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})}
|
|
|
|
|
export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
|
|
|
|
|
einfo " $(printf '%15s' 'Manual CC:') ${CC}"
|
|
|
|
|
}
|
|
|
|
|
@ -522,6 +495,27 @@ glibc_banner() {
|
|
|
|
|
echo "${b}"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_devpts() {
|
|
|
|
|
# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
|
|
|
|
|
|
|
|
|
|
# If merely building the binary package, then there's nothing to verify.
|
|
|
|
|
[[ ${MERGE_TYPE} == "buildonly" ]] && return
|
|
|
|
|
|
|
|
|
|
# Only sanity check when installing the native glibc.
|
|
|
|
|
[[ ${ROOT} != "/" ]] && return
|
|
|
|
|
|
|
|
|
|
# If they're opting in to the old suid code, then no need to check.
|
|
|
|
|
use suid && return
|
|
|
|
|
|
|
|
|
|
if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
|
|
|
|
|
eerror "In order to use glibc with USE=-suid, you must make sure that"
|
|
|
|
|
eerror "you have devpts mounted at /dev/pts with the gid=5 option."
|
|
|
|
|
eerror "Openrc should do this for you, so you should check /etc/fstab"
|
|
|
|
|
eerror "and make sure you do not have any invalid settings there."
|
|
|
|
|
die "mount & fix your /dev/pts settings"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# The following Kernel version handling functions are mostly copied from portage
|
|
|
|
|
# source. It's better not to use linux-info.eclass here since a) it adds too
|
|
|
|
|
# much magic, see bug 326693 for some of the arguments, and b) some of the
|
|
|
|
|
@ -583,7 +577,7 @@ eend_KV() {
|
|
|
|
|
|
|
|
|
|
get_kheader_version() {
|
|
|
|
|
printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
|
|
|
|
|
$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
|
|
|
|
|
$(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \
|
|
|
|
|
tail -n 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -593,7 +587,7 @@ get_kheader_version() {
|
|
|
|
|
sanity_prechecks() {
|
|
|
|
|
# Prevent native builds from downgrading
|
|
|
|
|
if [[ ${MERGE_TYPE} != "buildonly" ]] && \
|
|
|
|
|
[[ -z ${ROOT} ]] && \
|
|
|
|
|
[[ ${ROOT} == "/" ]] && \
|
|
|
|
|
[[ ${CBUILD} == ${CHOST} ]] && \
|
|
|
|
|
[[ ${CHOST} == ${CTARGET} ]] ; then
|
|
|
|
|
|
|
|
|
|
@ -604,7 +598,7 @@ sanity_prechecks() {
|
|
|
|
|
if has_version ">${CATEGORY}/${P}-r10000" ; then
|
|
|
|
|
eerror "Sanity check to keep you from breaking your system:"
|
|
|
|
|
eerror " Downgrading glibc is not supported and a sure way to destruction."
|
|
|
|
|
[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
|
|
|
|
|
die "Aborting to save your system."
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
|
|
|
|
|
@ -713,14 +707,6 @@ sanity_prechecks() {
|
|
|
|
|
# the phases
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# pkg_pretend
|
|
|
|
|
|
|
|
|
|
pkg_pretend() {
|
|
|
|
|
# All the checks...
|
|
|
|
|
einfo "Checking general environment sanity."
|
|
|
|
|
sanity_prechecks
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pkg_setup() {
|
|
|
|
|
# see bug 682570
|
|
|
|
|
[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
|
|
|
|
|
@ -746,6 +732,10 @@ src_unpack() {
|
|
|
|
|
unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PATCHES=(
|
|
|
|
|
"${FILESDIR}"/2.25/glibc-2.25-gshadow-handle-erange.patch
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
src_prepare() {
|
|
|
|
|
if ! use vanilla ; then
|
|
|
|
|
elog "Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER}"
|
|
|
|
|
@ -833,11 +823,7 @@ glibc_do_configure() {
|
|
|
|
|
myconf+=( --enable-stack-protector=no )
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
# Use '=strong' instead of '=all' to protect only functions
|
|
|
|
|
# worth protecting from stack smashes.
|
|
|
|
|
# '=all' is also known to have a problem in IFUNC resolution
|
|
|
|
|
# tests: https://sourceware.org/PR25680, bug #712356.
|
|
|
|
|
myconf+=( --enable-stack-protector=$(usex ssp strong no) )
|
|
|
|
|
myconf+=( --enable-stack-protector=$(usex ssp all no) )
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
myconf+=( --enable-stackguard-randomization )
|
|
|
|
|
@ -897,17 +883,16 @@ glibc_do_configure() {
|
|
|
|
|
--host=${CTARGET_OPT:-${CTARGET}}
|
|
|
|
|
$(use_enable profile)
|
|
|
|
|
$(use_with gd)
|
|
|
|
|
--with-headers=$(build_eprefix)$(alt_build_headers)
|
|
|
|
|
--prefix="$(host_eprefix)/usr"
|
|
|
|
|
--sysconfdir="$(host_eprefix)/etc"
|
|
|
|
|
--localstatedir="$(host_eprefix)/var"
|
|
|
|
|
--with-headers=$(alt_build_headers)
|
|
|
|
|
--prefix="${EPREFIX}/usr"
|
|
|
|
|
--sysconfdir="${EPREFIX}/etc"
|
|
|
|
|
--localstatedir="${EPREFIX}/var"
|
|
|
|
|
--libdir='$(prefix)'/$(get_libdir)
|
|
|
|
|
--mandir='$(prefix)'/share/man
|
|
|
|
|
--infodir='$(prefix)'/share/info
|
|
|
|
|
--libexecdir='$(libdir)'/misc/glibc
|
|
|
|
|
--with-bugurl=https://bugs.gentoo.org/
|
|
|
|
|
--with-pkgversion="$(glibc_banner)"
|
|
|
|
|
$(use_enable crypt)
|
|
|
|
|
$(use_multiarch || echo --disable-multi-arch)
|
|
|
|
|
$(use_enable systemtap)
|
|
|
|
|
$(use_enable nscd)
|
|
|
|
|
@ -923,8 +908,8 @@ glibc_do_configure() {
|
|
|
|
|
|
|
|
|
|
# There is no configure option for this and we need to export it
|
|
|
|
|
# since the glibc build will re-run configure on itself
|
|
|
|
|
export libc_cv_rootsbindir="$(host_eprefix)/sbin"
|
|
|
|
|
export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
|
|
|
|
|
export libc_cv_rootsbindir="${EPREFIX}/sbin"
|
|
|
|
|
export libc_cv_slibdir="${EPREFIX}/$(get_libdir)"
|
|
|
|
|
|
|
|
|
|
# We take care of patching our binutils to use both hash styles,
|
|
|
|
|
# and many people like to force gnu hash style only, so disable
|
|
|
|
|
@ -1052,8 +1037,8 @@ glibc_headers_configure() {
|
|
|
|
|
--enable-bind-now
|
|
|
|
|
--build=${CBUILD_OPT:-${CBUILD}}
|
|
|
|
|
--host=${CTARGET_OPT:-${CTARGET}}
|
|
|
|
|
--with-headers=$(build_eprefix)$(alt_build_headers)
|
|
|
|
|
--prefix="$(host_eprefix)/usr"
|
|
|
|
|
--with-headers=$(alt_build_headers)
|
|
|
|
|
--prefix="${EPREFIX}/usr"
|
|
|
|
|
${EXTRA_ECONF}
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@ -1090,7 +1075,7 @@ src_configure() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_src_compile() {
|
|
|
|
|
emake -C "$(builddir nptl)"
|
|
|
|
|
emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
src_compile() {
|
|
|
|
|
@ -1103,15 +1088,7 @@ src_compile() {
|
|
|
|
|
|
|
|
|
|
glibc_src_test() {
|
|
|
|
|
cd "$(builddir nptl)"
|
|
|
|
|
|
|
|
|
|
local myxfailparams=""
|
|
|
|
|
if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
|
|
|
|
|
for myt in ${XFAIL_TEST_LIST[@]} ; do
|
|
|
|
|
myxfailparams+="test-xfail-${myt}=yes "
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
emake ${myxfailparams} check
|
|
|
|
|
emake check
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_src_test() {
|
|
|
|
|
@ -1137,33 +1114,21 @@ src_test() {
|
|
|
|
|
run_locale_gen() {
|
|
|
|
|
# if the host locales.gen contains no entries, we'll install everything
|
|
|
|
|
local root="$1"
|
|
|
|
|
local inplace=""
|
|
|
|
|
|
|
|
|
|
if [[ "${root}" == "--inplace-glibc" ]] ; then
|
|
|
|
|
inplace="--inplace-glibc"
|
|
|
|
|
root="$2"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local locale_list="${root}/etc/locale.gen"
|
|
|
|
|
|
|
|
|
|
pushd "${ED}"/$(get_libdir) >/dev/null
|
|
|
|
|
|
|
|
|
|
if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
|
|
|
|
|
[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
|
|
|
|
|
ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
|
|
|
|
|
locale_list="${root}/usr/share/i18n/SUPPORTED"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
|
|
|
|
|
locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
|
|
|
|
|
--destdir "${root}"
|
|
|
|
|
|
|
|
|
|
popd >/dev/null
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
glibc_do_src_install() {
|
|
|
|
|
local builddir=$(builddir nptl)
|
|
|
|
|
cd "${builddir}"
|
|
|
|
|
|
|
|
|
|
emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
|
|
|
|
|
emake install_root="${D}$(alt_prefix)" install || die
|
|
|
|
|
|
|
|
|
|
# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
|
|
|
|
|
# which come without headers etc. Only needed for binary packages since the
|
|
|
|
|
@ -1176,20 +1141,13 @@ 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)
|
|
|
|
|
|
|
|
|
|
# Avoid stripping binaries not targeted by ${CHOST}. Or else
|
|
|
|
|
# ${CHOST}-strip would break binaries build for ${CTARGET}.
|
|
|
|
|
is_crosscompile && dostrip -x /
|
|
|
|
|
# gdb thread introspection relies on local libpthreas symbols. stripping breaks it
|
|
|
|
|
# See Note [Disable automatic stripping]
|
|
|
|
|
dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
|
|
|
|
|
|
|
|
|
|
if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
|
|
|
|
|
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:
|
|
|
|
|
# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
|
|
|
|
|
sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
|
|
|
|
|
sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"$(alt_usrlibdir)/libm.a || die
|
|
|
|
|
dodir $(alt_usrlibdir)/${P}
|
|
|
|
|
mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
|
|
|
|
|
mv "${ED}"$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# We'll take care of the cache ourselves
|
|
|
|
|
@ -1347,15 +1305,31 @@ glibc_do_src_install() {
|
|
|
|
|
|
|
|
|
|
# Generate all locales if this is a native build as locale generation
|
|
|
|
|
if use compile-locales && ! is_crosscompile ; then
|
|
|
|
|
run_locale_gen --inplace-glibc "${ED}/"
|
|
|
|
|
sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
|
|
|
|
|
run_locale_gen "${ED}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
## COREOS: Add some local changes:
|
|
|
|
|
# - Config files are installed by baselayout, not glibc.
|
|
|
|
|
# - Install nscd/systemd stuff in /usr.
|
|
|
|
|
|
|
|
|
|
# Use tmpfiles to put nscd.conf in /etc and create directories.
|
|
|
|
|
insinto /usr/share/baselayout
|
|
|
|
|
if ! in_iuse nscd || use nscd ; then
|
|
|
|
|
doins "${S}"/nscd/nscd.conf || die
|
|
|
|
|
systemd_newtmpfilesd "${FILESDIR}"/nscd-conf.tmpfiles nscd-conf.conf || die
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Clean out any default configs.
|
|
|
|
|
rm -rf "${ED}"/etc
|
|
|
|
|
|
|
|
|
|
# Restore this one for the SDK.
|
|
|
|
|
test ! -e "${T}"/00glibc || doenvd "${T}"/00glibc
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
glibc_headers_install() {
|
|
|
|
|
local builddir=$(builddir "headers")
|
|
|
|
|
cd "${builddir}"
|
|
|
|
|
emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
|
|
|
|
|
emake install_root="${D}$(alt_prefix)" install-headers
|
|
|
|
|
|
|
|
|
|
insinto $(alt_headers)/gnu
|
|
|
|
|
doins "${S}"/include/gnu/stubs.h
|
|
|
|
|
@ -1366,6 +1340,23 @@ 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
|
|
|
|
|
@ -1374,11 +1365,7 @@ src_install() {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
foreach_abi glibc_do_src_install
|
|
|
|
|
|
|
|
|
|
if ! use static-libs ; then
|
|
|
|
|
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.
|
|
|
|
|
@ -1431,7 +1418,7 @@ pkg_preinst() {
|
|
|
|
|
einfo "Defaulting /etc/host.conf:multi to on"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
[[ -n ${ROOT} ]] && return 0
|
|
|
|
|
[[ ${ROOT} != "/" ]] && return 0
|
|
|
|
|
[[ -d ${ED}/$(get_libdir) ]] || return 0
|
|
|
|
|
[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
|
|
|
|
|
}
|
|
|
|
|
@ -1442,11 +1429,15 @@ pkg_postinst() {
|
|
|
|
|
|
|
|
|
|
if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
|
|
|
|
|
# Generate fastloading iconv module configuration file.
|
|
|
|
|
"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
|
|
|
|
|
"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
|
|
|
|
|
use compile-locales || run_locale_gen "${EROOT}/"
|
|
|
|
|
if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then
|
|
|
|
|
# Reload init ... if in a chroot or a diff init package, ignore
|
|
|
|
|
# errors from this step #253697
|
|
|
|
|
/sbin/telinit U 2>/dev/null
|
|
|
|
|
|
|
|
|
|
use compile-locales || run_locale_gen "${EROOT}"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Check for sanity of /etc/nsswitch.conf, take 2
|
Kai Lüke