summaryrefslogtreecommitdiff
path: root/sys-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-07 05:35:45 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-07 05:35:45 +0100
commitc59fc2181f7402f8d0a548bcc897584a83139cc1 (patch)
tree29d91b826be40709b1a5c7e5772e6ad28c172c74 /sys-libs
parente863cb8850b3734386669ced72ba782bf20bde7a (diff)
gentoo auto-resync : 07:05:2023 - 05:35:45
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/Manifest.gzbin15066 -> 15059 bytes
-rw-r--r--sys-libs/glibc/Manifest4
-rw-r--r--sys-libs/glibc/glibc-2.37-r2.ebuild3
-rw-r--r--sys-libs/glibc/glibc-9999.ebuild136
4 files changed, 60 insertions, 83 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1e8b2e4f04ff..89aa18607382 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
Binary files differ
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index da8274d79f06..b4d6f4e1b95c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,6 +45,6 @@ EBUILD glibc-2.34-r14.ebuild 49635 BLAKE2B 38e4c1a6ba5e9ec521635859a3e3e40653f01
EBUILD glibc-2.35-r11.ebuild 50176 BLAKE2B a7999672c0039cb7ef79fd84b13ea7d8d752adeb185eac0744383f514b0897ad8b7518c9ea8392b8f4217ec0873f2d4b9e56bd1424378c83c2dd98122b2caf7d SHA512 bf7d103bb91722cd61720290bf38c6cb73d8d199e6479e35ab017de83006826b014c49d6dc0188cd3f4aaf906578ee4ae9f851d37346a4d9a228bee683930bfa
EBUILD glibc-2.36-r7.ebuild 52453 BLAKE2B ef5c9a4cbcc7fde3003910973c6d2fdcbb8fdc52e1eb75771919617651f2edc34f615d5508894e7f0a4ee3605bb2b638e001adfbe86a2183100c42808cd5dce6 SHA512 3101657a81f9110ce0072c070bb9aab2fad50fe46f968d99307faad572b426b204cbb6734d367e26c2708556628fb7d0dfb3f4a407432e7907032dfb5ead6666
EBUILD glibc-2.36-r8.ebuild 52462 BLAKE2B 96eb234269a40aa9b72c52e76274b9539e60a217969fffa8f3febbbe2e244b375349a8a5ff0b9d7939b757ee5b401a91dec1a66ad43af7d3afcfd58d1c9e8557 SHA512 aef4a0c782fcb79004d2a38d0b05c8c2e7cda13a333d2bd70791a09dddee61dc69af0fe3f1a785e2bdb237654f98a365e7f5c762d852a55b35a589d215c4eba7
-EBUILD glibc-2.37-r2.ebuild 52461 BLAKE2B 03101051b3b6c6fa22c15b86a8fd4eaf737f274e74792ceaa091f978fbba58ce5624061467de6331169b1c4412d02140896c05bc26e55ddd307bafb7d50199a6 SHA512 8abf464428ade62c5719087b8e026402f1732d4452c3f2f371612ecc561775eaa4b5382b7bd538a4121bf40849bfe892ee6031d55d129fe50ff66652cd470bd3
-EBUILD glibc-9999.ebuild 52432 BLAKE2B 0988666562a1d49f59d52a6368b426c154e532747f1bf1cba50529d3f2b5f71ff82c1b2af101e0dd87e158591f0a1a711b94959b794c56bcee92eaf03e8c16b6 SHA512 f97ee9b4c19ccbdae6ba17689ac11d5ef692359b6e82950c0ee83ddd9744d3fb05f1e1e20ca19a5394bc11e7162a363ddf62dbc3a33ef9148d01d561f7d13fe8
+EBUILD glibc-2.37-r2.ebuild 52523 BLAKE2B 756d34eac40dee2e5cc7d63cbf3c732a025610bc7e41cb9af7a60fec230f1f9d416769a89989e5821e9136dd47cd6359c05698d6c32d394694ad6f84b8bd9349 SHA512 cc7a1bd335ae344cf60385be072b560c6af3e4b3cf19a60de3bf02df8a1c8b63c63059368f8944728bf6968cb59dc4a7ba9e5be228f4a281ddda12129ad53466
+EBUILD glibc-9999.ebuild 51643 BLAKE2B 9c0e4e750405fd606fdeb7a12b47744a3eb1ba029bd111695793bf4f057a97a1a3b9a2ac1afa81c16b1ef94b024154d9b5794552264127ff7c40f7b7f6e9fb65 SHA512 b3a41250c36598015fd45e8ab8b8074021791725e842540098ef8d986d60491831a31dd3aa46d5b108fe3780b7f9bef898fd568a0237a00bca5d5630d44cafaa
MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.37-r2.ebuild b/sys-libs/glibc/glibc-2.37-r2.ebuild
index 6e9fa3dcb8b2..3b760ddcf5b3 100644
--- a/sys-libs/glibc/glibc-2.37-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r2.ebuild
@@ -131,6 +131,7 @@ DEPEND="${COMMON_DEPEND}
sys-apps/grep
app-alternatives/awk
)
+ doc? ( dev-lang/perl )
test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
@@ -1032,7 +1033,7 @@ glibc_do_configure() {
# execute Perl during configure if we're cross-compiling a prefix, but
# it will just disable mtrace in that case.
# Note: mtrace is needed by the test suite.
- ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
+ ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
# locale data is arch-independent
# https://bugs.gentoo.org/753740
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 38cec1fa3414..2375fd18f6a9 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
# Please read & adapt the page as necessary if obsolete.
@@ -23,6 +23,19 @@ EMULTILIB_PKG="true"
PATCH_VER=1
PATCH_DEV=dilfridge
+# gcc mulitilib bootstrap files version
+GCC_BOOTSTRAP_VER=20201208
+
+# systemd integration version
+GLIBC_SYSTEMD_VER=20210729
+
+# Minimum kernel version that glibc requires
+MIN_KERN_VER="3.2.0"
+
+# Minimum pax-utils version needed (which contains any new syscall changes for
+# its seccomp filter!). Please double check this!
+MIN_PAX_UTILS_VER="1.3.3"
+
if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
@@ -31,26 +44,11 @@ else
SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
fi
-RELEASE_VER=${PV}
-
-GCC_BOOTSTRAP_VER=20201208
-
-LOCALE_GEN_VER=2.23
-
-GLIBC_SYSTEMD_VER=20210729
-
-SRC_URI+=" https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-${LOCALE_GEN_VER}.tar.gz"
SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-# Minimum pax-utils version needed (which contains any new syscall changes for
-# its seccomp filter!). Please double check this!
-MIN_PAX_UTILS_VER="1.3.3"
-
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
# CHOST - machine that will host the binaries
@@ -99,19 +97,25 @@ fi
# Lastly, let's avoid some openssh nastiness, bug 708224, as
# convenience to our users.
-# gzip, grep, awk are needed by locale-gen, bug 740750
+# gzip, grep, awk are needed by locale-gen, bug 740750; depending on the
+# compile-locales useflag either in src_install or in pkg_postinst.
+IDEPEND="
+ !compile-locales? ( sys-apps/locale-gen )
+"
BDEPEND="
${PYTHON_DEPS}
>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
sys-devel/bison
- doc? ( sys-apps/texinfo )
- !compile-locales? (
- app-arch/gzip
- sys-apps/grep
- app-alternatives/awk
+ compile-locales? ( sys-apps/locale-gen )
+ doc? (
+ dev-lang/perl
+ sys-apps/texinfo
+ )
+ test? (
+ dev-lang/perl
+ >=net-dns/libidn2-2.3.0
)
- test? ( dev-lang/perl )
"
COMMON_DEPEND="
gd? ( media-libs/gd:2= )
@@ -119,26 +123,16 @@ COMMON_DEPEND="
audit? ( sys-process/audit )
caps? ( sys-libs/libcap )
) )
- perl? ( dev-lang/perl )
- test? ( dev-lang/perl )
suid? ( caps? ( sys-libs/libcap ) )
selinux? ( sys-libs/libselinux )
systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
- compile-locales? (
- app-arch/gzip
- sys-apps/grep
- app-alternatives/awk
- )
- test? ( >=net-dns/libidn2-2.3.0 )
"
RDEPEND="${COMMON_DEPEND}
- app-arch/gzip
- sys-apps/grep
- app-alternatives/awk
- sys-apps/gentoo-functions
+ sys-apps/locale-gen
!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
+ perl? ( dev-lang/perl )
"
RESTRICT="!test? ( test )"
@@ -670,7 +664,7 @@ foreach_abi() {
glibc_banner() {
local b="Gentoo ${PVR}"
- [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}"
+ [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
echo "${b}"
}
@@ -766,13 +760,6 @@ sanity_prechecks() {
fi
fi
- # Users have had a chance to phase themselves, time to give em the boot
- if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then
- eerror "You still haven't deleted ${EROOT}/etc/locales.build."
- eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher."
- die "Lazy upgrader detected"
- fi
-
if [[ ${CTARGET} == i386-* ]] ; then
eerror "i386 CHOSTs are no longer supported."
eerror "Chances are you don't actually want/need i386."
@@ -879,6 +866,8 @@ pkg_pretend() {
upgrade_warning
}
+# pkg_setup
+
pkg_setup() {
# see bug 682570
[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
@@ -907,23 +896,24 @@ src_unpack() {
unpack ${P}.tar.xz
cd "${WORKDIR}" || die
- unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.xz
+ unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
fi
cd "${WORKDIR}" || die
- unpack locale-gen-${LOCALE_GEN_VER}.tar.gz
use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
}
+# src_prepare
+
src_prepare() {
local patchsetname
if ! use vanilla ; then
if [[ ${PV} == 9999* ]] ; then
patchsetname="from git master"
else
- patchsetname="${RELEASE_VER}-${PATCH_VER}"
+ patchsetname="${PV}-${PATCH_VER}"
fi
- einfo "Applying Gentoo Glibc Patchset ${patchsetname}"
+ einfo "Applying Gentoo Glibc patchset ${patchsetname}"
eapply "${WORKDIR}"/patches
einfo "Done."
fi
@@ -932,21 +922,17 @@ src_prepare() {
gnuconfig_update
- cd "${WORKDIR}"
+ cd "${WORKDIR}" || die
find . -name configure -exec touch {} +
- # move the external locale-gen to its old place
- mkdir extra || die
- mv locale-gen-${LOCALE_GEN_VER} extra/locale || die
-
- eprefixify extra/locale/locale-gen
-
# Fix permissions on some of the scripts.
chmod u+x "${S}"/scripts/*.sh
- cd "${S}"
+ cd "${S}" || die
}
+# src_configure
+
glibc_do_configure() {
dump_build_environment
@@ -962,7 +948,7 @@ glibc_do_configure() {
# https://sourceware.org/PR22634#c0
case $(tc-arch ${CTARGET}) in
# Keep whitelist of targets where autodetection mostly works.
- amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+ amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
# Blacklist everywhere else
*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
esac
@@ -1031,7 +1017,7 @@ glibc_do_configure() {
# execute Perl during configure if we're cross-compiling a prefix, but
# it will just disable mtrace in that case.
# Note: mtrace is needed by the test suite.
- ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl no))"
+ ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
# locale data is arch-independent
# https://bugs.gentoo.org/753740
@@ -1040,6 +1026,7 @@ glibc_do_configure() {
# -march= option tricks build system to infer too
# high ISA level: https://sourceware.org/PR27318
libc_cv_include_x86_isa_level=no
+
# Explicit override of https://sourceware.org/PR27991
# exposes a bug in glibc's configure:
# https://sourceware.org/PR27991
@@ -1219,6 +1206,8 @@ src_configure() {
foreach_abi do_src_configure
}
+# src_compile
+
do_src_compile() {
emake -C "$(builddir nptl)"
}
@@ -1231,6 +1220,8 @@ src_compile() {
foreach_abi do_src_compile
}
+# src_test
+
glibc_src_test() {
cd "$(builddir nptl)"
@@ -1250,26 +1241,16 @@ glibc_src_test() {
SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=16 emake ${myxfailparams} check
}
-do_src_test() {
- local ret=0
-
- glibc_src_test
- : $(( ret |= $? ))
-
- return ${ret}
-}
-
src_test() {
if just_headers ; then
return
fi
- # Give tests more time to complete.
- export TIMEOUTFACTOR=5
-
- foreach_abi do_src_test || die "tests failed"
+ foreach_abi glibc_src_test || die "tests failed"
}
+# src_install
+
run_locale_gen() {
# if the host locales.gen contains no entries, we'll install everything
local root="$1"
@@ -1317,7 +1298,8 @@ glibc_do_src_install() {
# 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
+
+ # gdb thread introspection relies on local libpthreads symbols. stripping breaks it
# See Note [Disable automatic stripping]
dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
@@ -1435,6 +1417,8 @@ glibc_do_src_install() {
#################################################################
# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
+ #################################################################
+
# Make sure we install some symlink hacks so that when we build
# a 2nd stage cross-compiler, gcc finds the target system
# headers correctly. See gcc/doc/gccinstall.info
@@ -1458,15 +1442,8 @@ glibc_do_src_install() {
-e "s: \\\\::g" -e "s:/: :g" \
"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
|| die "generating /usr/share/i18n/SUPPORTED failed"
- cd "${WORKDIR}"/extra/locale
- dosbin locale-gen
- doman *.[0-8]
- insinto /etc
- doins locale.gen
-
- keepdir /usr/lib/locale
- cd "${S}"
+ cd "${S}" || die
# Install misc network config files
insinto /etc
@@ -1511,7 +1488,6 @@ 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
fi
}