File tree Expand file tree Collapse file tree 2 files changed +55
-0
lines changed Expand file tree Collapse file tree 2 files changed +55
-0
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,10 @@ FROM docker.io/library/ubuntu:24.04
33ARG AUTOCONF_VERSION="2.71"
44ARG AUTOCONF_ARCHIVE_VERSION="2023.02.20"
55ARG AUTOMAKE_VERSION="1.16.5"
6+ # Specific revisions of https://git.savannah.gnu.org/gitweb/?p=config.git
7+ # for config.guess and config.sub.
8+ ARG CONFIG_GUESS_REV="9428e344e65176b03b69e4bf4ed0d0fc51d4c26f"
9+ ARG CONFIG_SUB_REV="948ae97ca5703224bd3eada06b7a69f40dd15a02"
610
711LABEL org.opencontainers.image.source="https://github.com/python/cpython-devcontainers"
812LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
@@ -40,6 +44,15 @@ RUN PATCH_VERBOSE=1 curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archi
4044 && ./configure --prefix=/usr/local \
4145 && make \
4246 && make install
47+ ADD --chmod=755 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=${CONFIG_GUESS_REV} \
48+ /usr/local/share/autoconf/build-aux/config.guess
49+ ADD --chmod=755 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=${CONFIG_SUB_REV} \
50+ /usr/local/share/autoconf/build-aux/config.sub
51+ COPY config.sub.patch .
52+ RUN p=$(pwd)/config.sub.patch \
53+ && cd /usr/local/share/autoconf/build-aux \
54+ && patch -p1 <$p \
55+ && rm "$p"
4356
4457# https://stackoverflow.com/questions/8811381/possibly-undefined-macro-ac-msg-error/49103418#49103418
4558RUN cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \
Original file line number Diff line number Diff line change 1+ From bee7bb3310b356e99e3a0f75f23efbc97f1b0a24 Mon Sep 17 00:00:00 2001
2+ From: Russell Keith-Magee <
[email protected] >
3+ Date: Mon, 26 Feb 2024 09:21:10 +0800
4+ Subject: [PATCH] gh-114099: Add configure and Makefile targets to support iOS
5+ compilation. (GH-115390)
6+
7+ ---
8+ config.sub | Bin 36846 -> 37009 bytes
9+
10+ diff --git a/config.sub b/config.sub
11+ index 2c6a07ab3c3..1bb6a05dc11 100755
12+ --- a/config.sub
13+ +++ b/config.sub
14+ @@ -4,6 +4,7 @@
15+
16+ # shellcheck disable=SC2006,SC2268 # see below for rationale
17+
18+ + # Patched 2024-02-03 to include support for arm64_32 and iOS/tvOS/watchOS simulators
19+ timestamp='2024-01-01'
20+
21+ # This file is free software; you can redistribute it and/or modify it
22+ @@ -1127,7 +1128,7 @@ case $cpu-$vendor in
23+ xscale-* | xscalee[bl]-*)
24+ cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
25+ ;;
26+ - arm64-* | aarch64le-*)
27+ + arm64-* | aarch64le-* | arm64_32-*)
28+ cpu=aarch64
29+ ;;
30+
31+ @@ -1866,6 +1867,8 @@ case $kernel-$os-$obj in
32+ ;;
33+ *-eabi*- | *-gnueabi*-)
34+ ;;
35+ + ios*-simulator- | tvos*-simulator- | watchos*-simulator- )
36+ + ;;
37+ none--*)
38+ # None (no kernel, i.e. freestanding / bare metal),
39+ # can be paired with an machine code file format
40+ - -
41+ 2.47.1
42+
You can’t perform that action at this time.
0 commit comments