commit: 6f1eff2f87578a67d0aa0923564811988033eab8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 17 22:21:47 2025 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 17 22:22:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1eff2f
sys-libs/glibc: add 2.40-r11 (patchset 11), bump patchset of 2.41-r4 to 6
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-libs/glibc/Manifest | 3 +-
...{glibc-2.41-r4.ebuild => glibc-2.40-r11.ebuild} | 52 ++++++++--------------
sys-libs/glibc/glibc-2.41-r4.ebuild | 2 +-
3 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 0b291bb631b9..5dcdc68736b1 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -24,10 +24,11 @@ DIST glibc-2.38.tar.xz 18913712 BLAKE2B
f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4
DIST glibc-2.39-patches-11.tar.xz 192784 BLAKE2B
fef42e0bd2a3341f41cac56dc878dcc95b7f521ffb27686a9109fe92e0458e903a24e763db17631b8ae6c1e8de7add2a11979b970689b2378aeb6ef29da7ceb6
SHA512
9daf2c57d178c7ce9d98ee454f680280738b37571bbbecc1724282e4866df29b78e60de40ad81a6efcc0a75b45d08148cb1a5f942ae7e308ae6fa63f9671b7de
DIST glibc-2.39.tar.xz 18520988 BLAKE2B
9d98459a2d58401e07c081e0d841935b23998da75a7eb5a7ebd23a1f9ebab99dee623fe166397c1b6c926960c570f62dbca5cb3b5ce84a918adff6b7a15e16bb
SHA512
818f58172a52815b4338ea9f2a69ecaa3335492b9f8f64cbf8afb24c0d737982341968ecd79631cae3d3074ab0ae4bc6056fc4ba3ffe790849dc374835cd57e2
DIST glibc-2.40-patches-10.tar.xz 219604 BLAKE2B
e5937f1e6b89c03a77def09b1cf127be18d99259e488ae24c08dc0fc19b51e39604bbf3e7effdc7854f5d49702c2c7dc883eb403ad3d1d1d8247242003621571
SHA512
00ed4ce3862b97719671bd97eed112d2aa492f040e7af2a793954a18575f64e833606b65448b867ad7b5a983330bf1dcdd24a5cb80915866137ec41f2926b5e6
+DIST glibc-2.40-patches-11.tar.xz 227044 BLAKE2B
2a8c799a88596f3fc28bc45fc206f231f628ff83aae242d69e216b65983def35d3aaab282287f1d77cb9d37d10bb71c483815ea83dfb2e47670a4cfcfbd1d92f
SHA512
e984e4842951c24cf079e9a6f88771ede0709949402dd9f734cbfdf21ff40ca3d7380c0b9cc0c0d89943b6481adf8c7db2ab4b0ffe57e2e1fa514d925f0db395
DIST glibc-2.40-patches-8.tar.xz 112020 BLAKE2B
17f5a3e5486aa570cb4d9103a84b649af9731bc398a4ff65d3d24c8912215dc7f5f2d6fa9a0222c514374a132b96796e8926a5cc31c87b326bf6d1a39772bd7a
SHA512
97a28822f97d1c06773953750a8d9a38a6bd9ce488f4c4d5f0752b573591cbdc84dfbbb277e3fb8e5664c56596efc093fd83a78e4c47bb9c11cafe942b13a0f1
DIST glibc-2.40.tar.xz 18752204 BLAKE2B
8593cab5b2549b77159b6866fbb40b917e491fd5bc0814f7f85b6529166d78d4583436450c479b86cdfe468304fc4d2a9ba8294230a55dbc4c15e89c3ab6c000
SHA512
33caf91dbfddde6480b7cdf7a68b36aff8c522bfee56160af26af297f1b768668edb08bc4e1a7ff61c64721e3c1d49c347a5dd01c5edd3b914ee6479c8b27885
DIST glibc-2.41-patches-4.tar.xz 75808 BLAKE2B
09a5447ddcfb60fa5b8d6325ea19b4431a4c723deddda40ff1465726e6834a4b412bde218308ecf44a05b58226d6f2affc93b4fc1db5171cf3a55e54db17ee82
SHA512
54aca5239f5cbe7f50b10b9e503388801fe6ada4ec40f3f686b9dd20c2d377ceb361f5b6681bd30b3460edd649fc4a0219004e88e01c20288867de82bf0981a7
-DIST glibc-2.41-patches-5.tar.xz 83244 BLAKE2B
4c20a283ed3461339444b0cea362af8683ebabf42e8f202649b5412c52103dc2ab4bdb861a1d6245ee5bf72fc42c3242513ae9defc1f7d81614d53899a4ccf14
SHA512
d0ed692832ed482bfd26510b645472bb66ec3a865cc2ffc98099937dc26db64482036ac276360808a348a03dbec282a98ab8eaa64e70a96528d042d83244bfc7
+DIST glibc-2.41-patches-6.tar.xz 83980 BLAKE2B
ca689782db9f78751d5b5004ee9bf7bd6daf4cf071bb25507e53e4408fdd0331a9f4c82bbe7579e38540fc4d416bd858f76e5655f4e8a87048067fbc5e3c7a17
SHA512
bce972f5e036712e178d0adc97bef17b83a5c5cc3139d689bfc2847bc5e8126ee01250ce41033bc78919a7638965740d54eb431b240a9a32460c433335da968f
DIST glibc-2.41.tar.xz 19344868 BLAKE2B
4da62f489ba7a95bb069c2cfea8cf78e4d37e3a5f7e1736239670ba1dca12b69aa77bd00ced078c27d91b1e622c58cbd70258161a9d18c5b3bcc95863b8d744d
SHA512
894a3e5a796bc13df30c26a5bfbe4d60b5dbdaac54e7763432235124b547070c7dda88c50584536870cab79183d8cad73a3ac6ed09bfe54fa8482aad07253169
DIST glibc-systemd-20210729.tar.gz 1480 BLAKE2B
37722c7579df782d890e44dbab99c3de52ab466eb9de80d82405e9bb5620bf39ffc8c5f466a435bdb86ef6d36dd7019c0736573916bda6c67d02a2581e0ec979
SHA512
efd75af58b50522c28cdac7abd1fc56555bc1bb042512c90d8340c1ec09c5791b3872a305bf83723252bbde5855b75d958c041083457765c4cfd170732d09238
DIST glibc-systemd-20210814.tar.gz 1469 BLAKE2B
10fa7bcb46d4fdce9c0ab353cbd30871e9b09a347a13a9c9a3b5777f931aa3c826c158d2e49532c604d4a834f2fab4089b67495fb88d0398945dc50d45ad9ef1
SHA512
5346a9ea459a1e6ccf665389f2a294de1e16f1e3e05cdf07e3dd99ed0e4f6f8b52cc333d4bff3c75ac90ab6ce70cd4ab2b3e126f920ce7979abd6dda56315efc
diff --git a/sys-libs/glibc/glibc-2.41-r4.ebuild
b/sys-libs/glibc/glibc-2.40-r11.ebuild
similarity index 98%
copy from sys-libs/glibc/glibc-2.41-r4.ebuild
copy to sys-libs/glibc/glibc-2.40-r11.ebuild
index d2534188bef4..1fd448e30451 100644
--- a/sys-libs/glibc/glibc-2.41-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.40-r11.ebuild
@@ -12,7 +12,7 @@ TMPFILES_OPTIONAL=1
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=5
+PATCH_VER=11
PATCH_DEV=dilfridge
# gcc mulitilib bootstrap files version
@@ -33,7 +33,7 @@ MIN_PAX_UTILS_VER="1.3.3"
MIN_SYSTEMD_VER="254.9-r1"
inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic
gnuconfig \
- multilib systemd multiprocessing tmpfiles eapi9-ver
+ multilib systemd multiprocessing tmpfiles
DESCRIPTION="GNU libc C library"
HOMEPAGE="https://www.gnu.org/software/libc/";
@@ -118,7 +118,6 @@ BDEPEND="
test? (
dev-lang/perl
>=net-dns/libidn2-2.3.0
- sys-apps/gawk[mpfr]
)
"
COMMON_DEPEND="
@@ -179,7 +178,6 @@ XFAIL_TEST_LIST=(
# Fails with certain PORTAGE_NICENESS/PORTAGE_SCHEDULING_POLICY
tst-sched1
- tst-sched_setattr
# Fails regularly, unreliable
tst-valgrind-smoke
@@ -193,7 +191,6 @@ XFAIL_NSPAWN_TEST_LIST=(
# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
# https://sourceware.org/PR30603
test-errno-linux
- tst-aarch64-pkey
tst-bz21269
tst-mlock2
tst-ntp_gettime
@@ -292,13 +289,9 @@ do_run_test() {
# ignore build failures when installing a binary package #324685
do_compile_test "" "$@" 2>/dev/null || return 0
else
- ebegin "Performing simple compile test for ABI=${ABI}"
if ! do_compile_test "" "$@" ; then
ewarn "Simple build failed ... assuming this is desired
#324685"
- eend 1
return 0
- else
- eend 0
fi
fi
@@ -492,6 +485,10 @@ setup_flags() {
#
https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
replace-flags -O0 -O1
+ # glibc handles this internally already where it's appropriate;
+ # can't always have SSP when we're the ones setting it up, etc
+ filter-flags '-fstack-protector*'
+
# Similar issues as with SSP. Can't inject yourself that early.
filter-flags '-fsanitize=*'
@@ -895,12 +892,16 @@ upgrade_warning() {
is_crosscompile && return
if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z
${ROOT} ]]; then
- if ver_replacing -lt $(ver_cut 1-2 ${PV}); then
- ewarn "After upgrading glibc, please restart all
running processes."
- ewarn "Be sure to include init (telinit u) or systemd
(systemctl daemon-reexec)."
- ewarn "Alternatively, reboot your system."
- ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
- fi
+ local oldv newv=$(ver_cut 1-2 ${PV})
+ for oldv in ${REPLACING_VERSIONS}; do
+ if ver_test ${oldv} -lt ${newv}; then
+ ewarn "After upgrading glibc, please restart
all running processes."
+ ewarn "Be sure to include init (telinit u) or
systemd (systemctl daemon-reexec)."
+ ewarn "Alternatively, reboot your system."
+ ewarn "(See bug #660556, bug #741116, bug
#823756, etc)"
+ break
+ fi
+ done
fi
}
@@ -932,18 +933,12 @@ src_unpack() {
use multilib-bootstrap && unpack
gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="
-
https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git
- https://github.com/gentoo/glibc-patches.git
- "
+
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git";
EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
git-r3_src_unpack
mv patches-git/9999 patches || die
- EGIT_REPO_URI="
- https://sourceware.org/git/glibc.git
- https://git.sr.ht/~sourceware/glibc
- https://gitlab.com/x86-glibc/glibc.git
- "
+
+ EGIT_REPO_URI="https://sourceware.org/git/glibc.git";
EGIT_CHECKOUT_DIR=${S}
git-r3_src_unpack
else
@@ -972,15 +967,6 @@ src_prepare() {
einfo "Done."
fi
- case ${CTARGET} in
- m68*-aligned-*)
- einfo "Applying utmp format fix for m68k with
-maligned-int"
- eapply "${FILESDIR}/glibc-2.41-m68k-malign.patch"
- ;;
- *)
- ;;
- esac
-
default
gnuconfig_update
diff --git a/sys-libs/glibc/glibc-2.41-r4.ebuild
b/sys-libs/glibc/glibc-2.41-r4.ebuild
index d2534188bef4..b822bbdd4871 100644
--- a/sys-libs/glibc/glibc-2.41-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.41-r4.ebuild
@@ -12,7 +12,7 @@ TMPFILES_OPTIONAL=1
EMULTILIB_PKG="true"
# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=5
+PATCH_VER=6
PATCH_DEV=dilfridge
# gcc mulitilib bootstrap files version
