Add patch for MIPS compilation failure

See https://bugs.busybox.net/show_bug.cgi?id=14156 and https://git.busybox.net/busybox/commit/?id=29b53ef03fc7ddd3ba27898d77a900a2f184aa0d
docker-library · Aug 20, 2021 · 82c3cf0 · 82c3cf0
1 parent 350ed43
commit 82c3cf0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 3 deletions.
diff --git a/Dockerfile-builder.template b/Dockerfile-builder.template
@@ -11,6 +11,7 @@ RUN set -eux; \
 		linux-headers \
 		make \
 		musl-dev \
+		patch \
 		tzdata \
 	;
 {{ ) else ( -}}
@@ -24,6 +25,7 @@ RUN set -eux; \
 		gcc \
 		gnupg dirmngr \
 		make \
+		patch \
 	; \
 	rm -rf /var/lib/apt/lists/*
 {{ ) end -}}
@@ -38,7 +40,6 @@ RUN set -eux; \
 		cpio \
 		dpkg-dev \
 		g++ \
-		patch \
 		perl \
 		python \
 		rsync \
@@ -229,6 +230,16 @@ RUN set -eux; \
 	rm busybox.tar.bz2*
 
 WORKDIR /usr/src/busybox
+{{ if .version == "1.34.0" then ( -}}
+
+# https://bugs.busybox.net/show_bug.cgi?id=14156
+# https://git.busybox.net/busybox/commit/?id=29b53ef03fc7ddd3ba27898d77a900a2f184aa0d
+RUN set -eux; \
+	curl -fL -o mips.patch 'https://git.busybox.net/busybox/patch/?id=29b53ef03fc7ddd3ba27898d77a900a2f184aa0d'; \
+	echo '1fb4b9669cd6e86e04408a86483eb6e2dc4e72ea026b07926eaf50bb2349801e *mips.patch' | sha256sum -c -; \
+	patch --strip=1 --input=mips.patch; \
+	rm mips.patch
+{{ ) else "" end -}}
 
 RUN set -eux; \
 	\

diff --git a/stable/glibc/Dockerfile.builder b/stable/glibc/Dockerfile.builder
diff --git a/stable/musl/Dockerfile.builder b/stable/musl/Dockerfile.builder
diff --git a/stable/uclibc/Dockerfile.builder b/stable/uclibc/Dockerfile.builder
diff --git a/unstable/glibc/Dockerfile.builder b/unstable/glibc/Dockerfile.builder
diff --git a/unstable/musl/Dockerfile.builder b/unstable/musl/Dockerfile.builder
diff --git a/unstable/uclibc/Dockerfile.builder b/unstable/uclibc/Dockerfile.builder