gentoo auto-resync : 12:10:2022 - 01:39:26

4 files changed, 138 insertions, 3 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 9527196cda19..08b44a35d871 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -33,12 +33,12 @@ EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f815
 EBUILD python-3.10.6_p2.ebuild 11181 BLAKE2B f8180bd07e43dffedafd7d912bcb9a002e93c1514c72055b24c65f36b7ef477e748bb777fa02da4c6d2c6391a1eaa9f59266b09fafb2e7ca8a67a96efd6f423c SHA512 4613ab1e7336e38a91877d4b1c5558e5221a770d8171d92fff319c6a4f64127bd9cb6dd8c56d84e70558de8ac647a315d740336834cdfa1ad3b86b184408c54b
 EBUILD python-3.10.6_p3.ebuild 11161 BLAKE2B b1d379be929e3a5ef8eb45beff1581e99085fdfc3af2aad29c9202284b73c225b82ba8ae81fe1db6191bc97f45d59ad9de2bcf664407269e890bb658da4072e5 SHA512 724f964f56c8c8e7859719eaf3b009f84371b5c70c509147f2a010959e93455daf469399c4159a3cba61de80ab08c327e908d8ffdbbbdb2e9893e88172969a41
 EBUILD python-3.10.6_p4.ebuild 11158 BLAKE2B ffc60d5825f03183cf13557e9c88af963bef569bdea2a410c0d2b7efedbac0f6c7f6ea90647bf46e012567c87da49f5f9744cac3cce9faaad64418295135ddcb SHA512 945b1f59c7c9c805f331f88e2d69321c9d7df9b0d9471cb5a0fc40507bf815ebae9399b0853f1669cca89ce81f528ebc8d30f97ff2be3d9378ed9e547011aba4
-EBUILD python-3.10.7.ebuild 11160 BLAKE2B 38952cce0d02320f9d1ddf4a4966cb338a832982a16982d4300e0f7a55f5578909cee92eebe0c69bd2bece4e78d197b86a6fd18d8a912fded39371ee58c2254f SHA512 dcab16c151d51520d794c3657e6ad84b249229544f97abb35e25b523bce0db41c0f9fa6e4bf31120b40ff55bcbed88bcbb6e0b1370a1660b6c0a4bcd5a289b1c
+EBUILD python-3.10.7.ebuild 12456 BLAKE2B a895977e2543f8ea7d79bd344ec29cfa75eb126b22c6307375b0dca9f9c9f0a616813869eeb1b0b0bb164fb59c6103f8dccb10e0bf357dd0e9ec7c4c108e6c81 SHA512 92196f1eb1e0264f85a3c20703fe79eaf3ac401be9f9adcdfe1fc8aa4defc42361072eef6d13e1c801be8621bcb0d4ce268cf45fc72de92a807c76b7164546bb
 EBUILD python-3.11.0_rc2.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
 EBUILD python-3.8.13_p6.ebuild 9731 BLAKE2B 0660743997da89023e3192c16bee0c1a14289ddc2f3fa43e19f105d208359eed8155a8345f29c214322ada0aa5c7e5eb50a564546f506abc3ea2204f44d1217c SHA512 b47a01911ed23390ef2091b1f09edf16d2398178ba0d9ec792f8afd06fcf1fb472c020a908af3a6b7c20396f8c6049767d2f11cfe9d15afa4df135b2cc0ee046
 EBUILD python-3.8.13_p8.ebuild 9705 BLAKE2B ce8180be109068fe25e8b2931a69f4247ee10f841a15528d7d976ad0acd36bbc6a58cdcb72a2158abc6fe79e8f581f8abb5ac61af6e8f157b0993c1ff9febfcc SHA512 9c0169004d8c820ce53b62576898ad0ca36df2ef0c41cb313943042f5cb76b0246165a3aecf7c14f5c233d86273dcbf1800bfc928714947f304316db2412a357
-EBUILD python-3.8.14.ebuild 9708 BLAKE2B 5b5a745272d4f416e8e8b044a3b8b75674b5cba19f8a1dcc0c3b4f3c3bb5ccbb0b37f48d0b49d9001cf9fe35918199f4d8e40fe8c9269d32fd078e54dab9ec8c SHA512 c2bf2a454e3fb368bac78483f4898798ba6b6d9869e0019808b2a1ac89c84ecde4a7221e810bbafc40d008e08fd3185234ea24bdec5f62fd091813b39e73580e
+EBUILD python-3.8.14.ebuild 11004 BLAKE2B 487c52ba5cd66a625b6f0f4acce651293b88684446ba19b5355724b8ed37a2481bb97c9d9594c79a7690fe54200660b5fa37e26b0a5b7500fff9846f07fbc832 SHA512 ecc441c03fe4d9c04fc56947e5c7a26c6546d96477e21287740c0fcc3913b9e587f79938f4e8e80420a5b647c6b3109d9c43ee223e49532de268d9d0710b1248
 EBUILD python-3.9.13_p4.ebuild 10984 BLAKE2B 8743da1a832eb69289727f94f19a9ca7c9e42156847d25168adb1bee66cbc980d28f2969260baf5ddca124c01498f085bb9fd50c5e80083609a5d987337429b4 SHA512 d8cf0aae2e36445efb4a0d0df4a028ab7d990f017196a18127973b7d88dc4979585901102106c32d8281f640334b079a8efedea8f45fca75a13c2453cff4b64c
 EBUILD python-3.9.13_p6.ebuild 10960 BLAKE2B dcd386bfd116294e4723017de6afe87f8b99749553a57d20671e1a3454cfa481af0e2e15353dc2f0aa85fa050ae64b542e8c4707090fc0736496eb17407c7cde SHA512 13263d81cbd8e40e0428034753a6c290e48c44a149b438c5e23132b15b908fd49991a64515772860c89a9fd0dc867e4a309341ad52289242505ef7d92044d759
-EBUILD python-3.9.14.ebuild 10959 BLAKE2B 35040f6e41a454b1595fc5f4914a2a07d0b11f319986e53f1eddf74b930c30a39a2f4e64b0d8bd1fd853902a4835702997a748d42f5263e1731eb08fedea43cf SHA512 b0093d91a125d4968e0a8033567691834a9cabc4ab698ae0d9c0a42a7f4101318b3dd9afb538cc553b764b7a39a71b5ec8683d1dbd64d6d5c2a4e0e36ea2d24a
+EBUILD python-3.9.14.ebuild 12255 BLAKE2B 9b36b65864095d95b3581bdc5683664f513f2c8c78da3512dc1cc80590df6925faf3658e342df9770970a6442cd63d918f46f34aaf3b45fd0a118bb4c0d0c3bd SHA512 1131ca44e90a211c6cb726bfd2a0dc3ee72fc02e46d368be83d57314d7cd294bb8924e13ca96e8014d7b41ef2091116e9657d1c4ea892f5818949d8b07161c3a
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.7.ebuild b/dev-lang/python/python-3.10.7.ebuild
index 5670e81124d4..921468637a1a 100644
--- a/dev-lang/python/python-3.10.7.ebuild
+++ b/dev-lang/python/python-3.10.7.ebuild
@@ -237,6 +237,51 @@ src_configure() {
 	local -x LDFLAGS_NODIST=${LDFLAGS}
 	local -x CFLAGS= LDFLAGS=
 
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
diff --git a/dev-lang/python/python-3.8.14.ebuild b/dev-lang/python/python-3.8.14.ebuild
index 034a3f2c94f2..a38985990051 100644
--- a/dev-lang/python/python-3.8.14.ebuild
+++ b/dev-lang/python/python-3.8.14.ebuild
@@ -190,6 +190,51 @@ src_configure() {
 	local -x LDFLAGS_NODIST=${LDFLAGS}
 	local -x CFLAGS= LDFLAGS=
 
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
diff --git a/dev-lang/python/python-3.9.14.ebuild b/dev-lang/python/python-3.9.14.ebuild
index 34c4173385b1..0ceb169b200f 100644
--- a/dev-lang/python/python-3.9.14.ebuild
+++ b/dev-lang/python/python-3.9.14.ebuild
@@ -231,6 +231,51 @@ src_configure() {
 	local -x LDFLAGS_NODIST=${LDFLAGS}
 	local -x CFLAGS= LDFLAGS=
 
+	if tc-is-cross-compiler ; then
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
 	econf "${myeconfargs[@]}"
 
 	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then