Skip to content

Commit 2941b7e

Browse files
committed
autoconf: Update config.guess and config.sub
Also refresh `config.sub.patch` to match <https://lists.gnu.org/archive/html/config-patches/2025-01/msg00003.html>.
1 parent bc133da commit 2941b7e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

autoconf/Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ FROM docker.io/library/ubuntu:24.04
33
ARG AUTOCONF_VERSION="2.72"
44
ARG AUTOCONF_ARCHIVE_VERSION="2023.02.20"
55
ARG AUTOMAKE_VERSION="1.16.5"
6-
# Specific revisions of https://git.savannah.gnu.org/git/config.git
6+
# Specific revision of https://git.savannah.gnu.org/git/config.git
77
# for config.guess and config.sub.
8-
ARG CONFIG_GUESS_REV="9428e344e65176b03b69e4bf4ed0d0fc51d4c26f"
9-
ARG CONFIG_SUB_REV="948ae97ca5703224bd3eada06b7a69f40dd15a02"
8+
ARG CONFIG_GIT_REV="00b15927496058d23e6258a28d8996f87cf1f191"
109

1110
LABEL org.opencontainers.image.source="https://github.com/python/cpython-devcontainers"
1211
LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
@@ -44,9 +43,9 @@ RUN PATCH_VERBOSE=1 curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archi
4443
&& ./configure --prefix=/usr/local \
4544
&& make \
4645
&& 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} \
46+
ADD --chmod=755 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=${CONFIG_GIT_REV} \
4847
/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} \
48+
ADD --chmod=755 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=${CONFIG_GIT_REV} \
5049
/usr/local/share/autoconf/build-aux/config.sub
5150
COPY config.sub.patch .
5251
RUN p=$(pwd)/config.sub.patch \

autoconf/config.sub.patch

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From bee7bb3310b356e99e3a0f75f23efbc97f1b0a24 Mon Sep 17 00:00:00 2001
1+
From 7a7c6fc48512405ede8b2db440b702e866364b00 Mon Sep 17 00:00:00 2001
22
From: Russell Keith-Magee <[email protected]>
33
Date: Mon, 26 Feb 2024 09:21:10 +0800
44
Subject: [PATCH] config.sub: Include support for arm64_32 and iOS/tvOS/watchOS
@@ -25,22 +25,23 @@ The `-simulator` suffix is significant because iOS devices and iOS
2525
simulators have a different ABI. It is therefore essential that these
2626
can be differentiated in a compiler triple.
2727
---
28-
config.sub | 5 ++++-
29-
1 file changed, 4 insertions(+), 1 deletion(-)
28+
config.sub | 6 ++++--
29+
1 file changed, 4 insertions(+), 2 deletions(-)
3030

3131
diff --git a/config.sub b/config.sub
32-
index 2c6a07a..1bb6a05 100755
32+
index 4aaae46..335706d 100755
3333
--- a/config.sub
3434
+++ b/config.sub
35-
@@ -4,6 +4,7 @@
35+
@@ -4,7 +4,7 @@
3636

37-
# shellcheck disable=SC2006,SC2268 # see below for rationale
37+
# shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale
3838

39-
+# Patched 2024-02-03 to include support for arm64_32 and iOS/tvOS/watchOS simulators
40-
timestamp='2024-01-01'
39+
-timestamp='2024-05-27'
40+
+timestamp='2025-01-06'
4141

4242
# This file is free software; you can redistribute it and/or modify it
43-
@@ -1127,7 +1128,7 @@ case $cpu-$vendor in
43+
# under the terms of the GNU General Public License as published by
44+
@@ -1194,7 +1194,7 @@ case $cpu-$vendor in
4445
xscale-* | xscalee[bl]-*)
4546
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
4647
;;
@@ -49,7 +50,7 @@ index 2c6a07a..1bb6a05 100755
4950
cpu=aarch64
5051
;;
5152

52-
@@ -1866,6 +1867,8 @@ case $kernel-$os-$obj in
53+
@@ -2249,6 +2249,8 @@ case $kernel-$os-$obj in
5354
;;
5455
*-eabi*- | *-gnueabi*-)
5556
;;

0 commit comments

Comments
 (0)