Skip to content

Commit ce00f70

Browse files
Copilotbrettcannon
andauthored
Use cgit downloads for GNU config scripts
Co-authored-by: brettcannon <54418+brettcannon@users.noreply.github.com>
1 parent c1056d1 commit ce00f70

3 files changed

Lines changed: 7 additions & 4174 deletions

File tree

autoconf/Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +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-
# config.guess and config.sub are vendored from revision
7-
# 00b15927496058d23e6258a28d8996f87cf1f191 of
8-
# https://git.savannah.gnu.org/git/config.git.
6+
# Specific revision of https://git.savannah.gnu.org/git/config.git
7+
# for config.guess and config.sub.
8+
ARG CONFIG_GIT_REV="00b15927496058d23e6258a28d8996f87cf1f191"
99

1010
LABEL org.opencontainers.image.source="https://github.com/python/cpython-devcontainers"
1111
LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:24.04"
@@ -46,8 +46,10 @@ RUN PATCH_VERBOSE=1 curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archi
4646
&& ./configure --prefix=/usr/local \
4747
&& make \
4848
&& make install
49-
COPY --chmod=755 config.guess /usr/local/share/autoconf/build-aux/config.guess
50-
COPY --chmod=755 config.sub /usr/local/share/autoconf/build-aux/config.sub
49+
ADD --chmod=755 https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${CONFIG_GIT_REV} \
50+
/usr/local/share/autoconf/build-aux/config.guess
51+
ADD --chmod=755 https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${CONFIG_GIT_REV} \
52+
/usr/local/share/autoconf/build-aux/config.sub
5153
COPY config.sub.patch .
5254
RUN p=$(pwd)/config.sub.patch \
5355
&& cd /usr/local/share/autoconf/build-aux \

0 commit comments

Comments
 (0)