gentoo auto-resync : 25:07:2023 - 05:42:52

3 files changed, 28 insertions, 24 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ae2fad1cc0b1..aef5ad32be2c 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -43,6 +43,6 @@ EBUILD glibc-2.33-r14.ebuild 48432 BLAKE2B 3ddfaf947d68a7831e2c29887ae75fab9d05b
 EBUILD glibc-2.34-r14.ebuild 49647 BLAKE2B 62f4b3d27f645c2576dc58e3079829dfe626046ea30d978cab6e8dae5e12a65ef33de89fc475cb7f64fd787638903633ef9deb6c12473db4e4dbe883af297110 SHA512 4c207cdea2b094a1626f1f7695611d520b9ab72b0829bf7aec18d55287cab55ae4a06eadfc844578ec8da31a3f562cfb921fc9208a2b50cd9f92f8370b19c1ee
 EBUILD glibc-2.35-r11.ebuild 50188 BLAKE2B 7877e71cb62608e79ac5e2a7751f453aa9d1444571612da11ab98e55ecb70b025c7372fea749cb438d89bb8e5fd85e97f2224c542df1da3ba05424a1079a0a1a SHA512 a1d133c50f7012ce01c7394fdfc69ca17eee9af9643d29274a4e47a9dd844e15ead16ea477bc9eb4131202b4caa878f320d799f05858143da33742930fad8cc7
 EBUILD glibc-2.36-r8.ebuild 52466 BLAKE2B fc59a2935c5e9487585449477ae7a0db2b005467071d4fae7b23169a1c309b716771d9dec01920deeea5eab1dfbc363817612e560cf49be1306c0691d0badd86 SHA512 9510470fa442309ca0df07ff2f0f0ac664cecd3b11080a1aa765aa6307057bf28a35742bedbd83b7d77fec63a67886bb109b5841cdafdec3e374d7df73bb2016
-EBUILD glibc-2.37-r3.ebuild 52132 BLAKE2B 08efaf2149cd95412f19f15493393b4b0d7665f3c76164e545bb4bdcfec047bc159ee4e226fc966d25c71445fbaf205a085211b6810f9881a57954e6b7eb8cf3 SHA512 11f1d803f368cbdcadcab7e4850d5140f8a3e4ce2c3e816cb527b39d0eb263719b9055cd1100e6243396100f29054f72c547d52b8368872e0250cc5bd64f16b1
-EBUILD glibc-9999.ebuild 52139 BLAKE2B 47329797db42053ec3175540ce90d69514139c2bb28946d599e2497180d3c878289a72e99db37fe414205b0efa52318244e01485c04e0dbce3550884a8055dc8 SHA512 6aa22a814f15bc3fcbc3bcb67a82d11cfeb156cc773e95c23936118fe55dae231ec4a30cbdc59bc7575d5d8f25eff817a77cba33121d4993458a4923dd00cba1
+EBUILD glibc-2.37-r3.ebuild 52043 BLAKE2B 91491de207d167232704fc184736ad240935d2534d9233ee980c854666e74c2ee2da028163e06ccfb64e39cc3720ee1d104e8bf6aa9cc3c643f4e3875f11e6db SHA512 559a26fd9fade821b6747a992d3e54b4660cf8c2e71319cc5820554409b913fd0bb9cb5c3efc364b2cafcb3979eea715949cc6a983cd376eb13d546487719981
+EBUILD glibc-9999.ebuild 51973 BLAKE2B b610596ac5f17f463126bc3f73e21bb2e30336d98b4580544f367c7bdb7e77168170907ff59f47408db3945cb6f7a11edc780e36cb1955909571a75e6312b89b SHA512 987dbd374a4f1c11fa0eb09dccb40e4bc8eedef7ef3f662de27bcb4e59823f86c2855bc968ad9b93f0d1ff2107b9550bc84466c3e76c7db7860f91773c0e4c36
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.37-r3.ebuild b/sys-libs/glibc/glibc-2.37-r3.ebuild
index f46cdcac0bfa..c3c9ca521d37 100644
--- a/sys-libs/glibc/glibc-2.37-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.37-r3.ebuild
@@ -6,13 +6,10 @@ EAPI=8
 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
 # Please read & adapt the page as necessary if obsolete.
 
-# Please keep the python line in BDEPEND updated and do NOT use eclasses pr
-# ${PYTHON_DEPS} (since they are too strict and lead to problems with the
-# package order during upgrades).
-
+PYTHON_COMPAT=( python3_{9..11} )
 TMPFILES_OPTIONAL=1
 
-inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -104,7 +101,7 @@ IDEPEND="
 	!compile-locales? ( sys-apps/locale-gen )
 "
 BDEPEND="
-	|| ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 )
+	${PYTHON_DEPS}
 	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	sys-devel/bison
 	compile-locales? ( sys-apps/locale-gen )
@@ -867,6 +864,13 @@ pkg_pretend() {
 	upgrade_warning
 }
 
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
 # src_unpack
 
 src_unpack() {
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 2b4e84c98db7..a0250a2928fc 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -6,13 +6,10 @@ EAPI=8
 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
 # Please read & adapt the page as necessary if obsolete.
 
-# Please keep the python line in BDEPEND updated and do NOT use eclasses pr
-# ${PYTHON_DEPS} (since they are too strict and lead to problems with the
-# package order during upgrades).
-
+PYTHON_COMPAT=( python3_{9..11} )
 TMPFILES_OPTIONAL=1
 
-inherit prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
+inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
 	multilib systemd multiprocessing tmpfiles
 
 DESCRIPTION="GNU libc C library"
@@ -42,7 +39,7 @@ MIN_PAX_UTILS_VER="1.3.3"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	#KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
@@ -104,7 +101,7 @@ IDEPEND="
 	!compile-locales? ( sys-apps/locale-gen )
 "
 BDEPEND="
-	|| ( dev-lang/python:3.11 dev-lang/python:3.10 dev-lang/python:3.9 )
+	${PYTHON_DEPS}
 	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
 	sys-devel/bison
 	compile-locales? ( sys-apps/locale-gen )
@@ -867,6 +864,13 @@ pkg_pretend() {
 	upgrade_warning
 }
 
+# pkg_setup
+
+pkg_setup() {
+	# see bug 682570
+	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
 # src_unpack
 
 src_unpack() {
@@ -986,6 +990,7 @@ glibc_do_configure() {
 	myconf+=(
 		--disable-werror
 		--enable-bind-now
+		--enable-fortify-source
 		--build=${CBUILD_OPT:-${CBUILD}}
 		--host=${CTARGET_OPT:-${CTARGET}}
 		$(use_enable profile)
@@ -1017,15 +1022,10 @@ glibc_do_configure() {
 		# https://bugs.gentoo.org/753740
 		libc_cv_complocaledir='${exec_prefix}/lib/locale'
 
-		# -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
-		libc_cv_have_x86_lahf_sahf=no
-		libc_cv_have_x86_movbe=no
+		# On aarch64 there is no way to override -mcpu=native, and if
+		# the current cpu does not support SVE configure fails.
+		# Let's boldly assume our toolchain can always build SVE instructions.
+		libc_cv_aarch64_sve_asm=yes
 
 		${EXTRA_ECONF}
 	)