File tree Expand file tree Collapse file tree 5 files changed +17
-3
lines changed
Expand file tree Collapse file tree 5 files changed +17
-3
lines changed Original file line number Diff line number Diff line change 1- FROM ubuntu:24.04
1+ FROM ubuntu:25.10
22
33ENV DEBIAN_FRONTEND=noninteractive
44RUN \
1414 python3-setuptools python3-pip python3-venv python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \
1515 curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
1616 apt-get -y install nodejs && \
17- apt-get -y clean && \
17+ apt-get -y autoremove && \
18+ apt-get -y clean autoclean && \
19+ rm -rf /var/lib/apt/lists/* && \
1820 git config --global user.email "builder@localhost" && \
1921 git config --global user.name "Builder" && \
2022 git config --global advice.detachedHead false
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ ffbuild_dockerdl() {
1717
1818ffbuild_dockerbuild () {
1919 # No automake 1.18 packaged anywhere yet.
20- sed -i ' s/-1.18/-1.16 /' Makefile.devel libcharset/Makefile.devel
20+ sed -i ' s/-1.18/-1.17 /' Makefile.devel libcharset/Makefile.devel
2121
2222 (unset CC CFLAGS GMAKE && ./autogen.sh)
2323
Original file line number Diff line number Diff line change @@ -8,6 +8,9 @@ ffbuild_enabled() {
88}
99
1010ffbuild_dockerbuild () {
11+ # The version-detection here fails for Debian-Versions of libtoolize, so it needs a bit of help
12+ sed -i -e ' s/libtool_version=.*/libtool_version=2.5/g' ./autogen.sh
13+
1114 ./autogen.sh --noconf
1215
1316 local myconf=(
Original file line number Diff line number Diff line change @@ -9,10 +9,15 @@ ffbuild_enabled() {
99
1010ffbuild_dockerdl () {
1111 default_dl .
12+
13+ # This is where they decided to put downloads for external dependencies, so it needs to run here
1214 echo " ./autogen.sh"
1315}
1416
1517ffbuild_dockerbuild () {
18+ # re-run autoreconf explicitly because tools versions might have changed since it generared the dl cache
19+ autoreconf -isf
20+
1621 local myconf=(
1722 --prefix=" $FFBUILD_PREFIX "
1823 --host=" $FFBUILD_TOOLCHAIN "
Original file line number Diff line number Diff line change @@ -8,6 +8,10 @@ ffbuild_enabled() {
88}
99
1010ffbuild_dockerbuild () {
11+ # libtoolize version detection is broken, disable it, we got the right versions
12+ printf ' print "999999\\n"\n' > autogen-get-version-mock.pl
13+ sed -i -e ' s|/autogen-get-version.pl|/autogen-get-version-mock.pl|g' ./autogen.sh
14+
1115 NOCONFIGURE=1 ./autogen.sh
1216 touch doc/twolame.1
1317
You can’t perform that action at this time.
0 commit comments