Merge pull request #931 from infosiftr/riscv-speedup

Attempt to speed up riscv64 builds
docker-library · Jun 13, 2024 · 676a087 · 676a087
2 parents b968d48 + 2d4fb58
commit 676a087
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 8 deletions.
diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.19/Dockerfile
diff --git a/3.10/alpine3.20/Dockerfile b/3.10/alpine3.20/Dockerfile
diff --git a/3.11/alpine3.19/Dockerfile b/3.11/alpine3.19/Dockerfile
diff --git a/3.11/alpine3.20/Dockerfile b/3.11/alpine3.20/Dockerfile
diff --git a/3.12/alpine3.19/Dockerfile b/3.12/alpine3.19/Dockerfile
diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.20/Dockerfile
diff --git a/3.13-rc/alpine3.19/Dockerfile b/3.13-rc/alpine3.19/Dockerfile
diff --git a/3.13-rc/alpine3.20/Dockerfile b/3.13-rc/alpine3.20/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -158,7 +158,15 @@ RUN set -eux; \
 	./configure \
 		--build="$gnuArch" \
 		--enable-loadable-sqlite-extensions \
+{{
+	# skip optimizations on alpine on riscv64 (except python 3.8 and 3.9)
+	# only 3.8 and 3.9 complete building on riscv64 with optimizations, 3.10-3.13rc all hit the 3 hour limit
+	if (is_alpine | not) or ( [ "3.8", "3.9" ] | index(rcVersion) ) then (
+-}}
 		--enable-optimizations \
+{{ ) else ( -}}
+		$(test "$gnuArch" != 'riscv64-linux-musl' && echo '--enable-optimizations') \
+{{ ) end -}}
 		--enable-option-checking=fatal \
 		--enable-shared \
 {{