Apply upstream patch to have more archs to build

williamdes · williamdes · commit 40c800a902e9 · 2023-02-22T13:31:23.000+01:00
RustPython/RustPython#4499
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -10,22 +10,26 @@ ENV CARGO_INSTALL_ROOT="/workdir"
 # Newer rust needed due to let...else feature
 RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community rust cargo
 
-RUN apk --no-cache add musl-dev
+RUN apk --no-cache add musl-dev git
 
 ADD https://github.com/RustPython/RustPython/archive/refs/tags/v$RUST_PYTHON_VERSION.tar.gz /tmp/v$RUST_PYTHON_VERSION.tar.gz
 ADD https://github.com/RustPython/__doc__/archive/d927debd491e4c45b88e953e6e50e4718e0f2965.tar.gz /tmp/rp__doc__.tar.gz
 
+# See: https://github.com/RustPython/RustPython/pull/4499
+ADD https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e99f4be5baff2.patch /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
+
 RUN mkdir /workdir/rp__doc__/ && tar --strip-components=1 -C /workdir/rp__doc__/ -xzf /tmp/rp__doc__.tar.gz
 
 RUN tar --strip-components=1 -C /workdir -xzf /tmp/v$RUST_PYTHON_VERSION.tar.gz
+RUN git  apply /tmp/9cac89347e2276fcb309f108561e99f4be5baff2.patch
 
 # Remove the git mode that triggers an error on armv6 and armv7
 # Ref: https://github.com/rust-lang/cargo/issues/2808 (failed to mmap. Could not write data: Out of memory; class=Os (2))
 RUN sed -i 's#{ git = .*#{ path = "/workdir/rp__doc__/" }#' /workdir/derive-impl/Cargo.toml
 
 RUN cargo fetch
 
-RUN if [ "$(uname -m)" != "ppc64le" ] && [ "$(uname -m)" != "s390x" ] && [ "$(uname -m)" != "aarch64" ]; then cargo build --features freeze-stdlib --release --locked --offline --bin rustpython; else cargo build --no-default-features --features threading,zlib,importlib,rustpython-parser/lalrpop --release --locked --offline --bin rustpython; fi
+RUN cargo build --features freeze-stdlib --release --locked --offline --bin rustpython
 
 FROM alpine:3.17
 
