docker-library · tianon · May 9, 2025 · May 5, 2025 · tianon · May 8, 2025
diff --git a/3.10/alpine3.20/Dockerfile b/3.10/alpine3.20/Dockerfile
diff --git a/3.10/alpine3.21/Dockerfile b/3.10/alpine3.21/Dockerfile
diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile
diff --git a/3.10/bullseye/Dockerfile b/3.10/bullseye/Dockerfile
diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile
diff --git a/3.10/slim-bullseye/Dockerfile b/3.10/slim-bullseye/Dockerfile
diff --git a/3.11/alpine3.20/Dockerfile b/3.11/alpine3.20/Dockerfile
diff --git a/3.11/alpine3.21/Dockerfile b/3.11/alpine3.21/Dockerfile
diff --git a/3.11/bookworm/Dockerfile b/3.11/bookworm/Dockerfile
diff --git a/3.11/bullseye/Dockerfile b/3.11/bullseye/Dockerfile
diff --git a/3.11/slim-bookworm/Dockerfile b/3.11/slim-bookworm/Dockerfile
diff --git a/3.11/slim-bullseye/Dockerfile b/3.11/slim-bullseye/Dockerfile
diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.20/Dockerfile
diff --git a/3.12/alpine3.21/Dockerfile b/3.12/alpine3.21/Dockerfile
diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile
diff --git a/3.12/bullseye/Dockerfile b/3.12/bullseye/Dockerfile
diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile
diff --git a/3.12/slim-bullseye/Dockerfile b/3.12/slim-bullseye/Dockerfile
diff --git a/3.13/alpine3.20/Dockerfile b/3.13/alpine3.20/Dockerfile
diff --git a/3.13/alpine3.21/Dockerfile b/3.13/alpine3.21/Dockerfile
diff --git a/3.13/bookworm/Dockerfile b/3.13/bookworm/Dockerfile
diff --git a/3.13/bullseye/Dockerfile b/3.13/bullseye/Dockerfile
diff --git a/3.13/slim-bookworm/Dockerfile b/3.13/slim-bookworm/Dockerfile
diff --git a/3.13/slim-bullseye/Dockerfile b/3.13/slim-bullseye/Dockerfile
diff --git a/3.14-rc/alpine3.20/Dockerfile b/3.14-rc/alpine3.20/Dockerfile
diff --git a/3.14-rc/alpine3.21/Dockerfile b/3.14-rc/alpine3.21/Dockerfile
diff --git a/3.14-rc/bookworm/Dockerfile b/3.14-rc/bookworm/Dockerfile
diff --git a/3.14-rc/bullseye/Dockerfile b/3.14-rc/bullseye/Dockerfile
diff --git a/3.14-rc/slim-bookworm/Dockerfile b/3.14-rc/slim-bookworm/Dockerfile
diff --git a/3.14-rc/slim-bullseye/Dockerfile b/3.14-rc/slim-bullseye/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -180,9 +180,10 @@ RUN set -eux; \
 		--enable-shared \
 {{
 	# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
-	# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
+	# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
+	# skip LTO on alpine on riscv64: https://github.com/docker-library/python/pull/935, https://github.com/docker-library/python/pull/1038
-	# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
+	# <3.10 does not have -fno-semantic-interposition enabled and --with-lto does nothing for performance
+	# skip LTO on alpine on riscv64: https://github.com/docker-library/python/pull/935, https://github.com/docker-library/python/pull/1038
+	# skip LTO on alpine on riscv64: https://github.com/docker-library/python/pull/935, https://github.com/docker-library/python/pull/1038
 	if rcVersion == "3.9" then "" else (
 -}}
-		--with-lto \
+		$(test "$gnuArch" != 'riscv64-linux-musl' && echo '--with-lto') \
 {{ ) end -}}
 		--with-ensurepip \
 	; \

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -136,12 +136,6 @@ for version; do
 				;;
 		esac
 
-		# https://github.com/docker-library/python/pull/931 (riscv64 builds on 3.11+ take way too long 😞)
-		case "$version" in
-			3.9 | 3.10) ;;
-			*) variantArches="$(sed <<<" $variantArches " -e 's/ riscv64 / /g')" ;;
-		esac
-
 		# https://github.com/python/cpython/issues/93619 (Linking error when building 3.11 beta on mips64le) + https://peps.python.org/pep-0011/ (mips is not even tier 3)
 		case "$version" in
 			3.9) ;;