Skip to content

Commit f3b1a5c

Browse files
wget2: fix build (#11049)
1 parent 8eb86f7 commit f3b1a5c

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

projects/wget2/Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ FROM gcr.io/oss-fuzz-base/base-builder
1818
RUN apt-get update && apt-get install -y \
1919
make \
2020
pkg-config \
21-
gettext \
2221
autogen \
2322
autopoint \
2423
autoconf \
@@ -40,6 +39,14 @@ RUN apt-get update && apt-get install -y \
4039
libtasn1-bin \
4140
libz-dev
4241

42+
# Get a more recent version of gettext as the one in the package
43+
# manager is too old for wget2.
44+
RUN wget https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.2.tar.gz && \
45+
tar -xzf ./gettext-0.22.2.tar.gz && \
46+
cd gettext-0.22.2 && \
47+
./configure && \
48+
make && \
49+
make install
4350
ENV GNULIB_TOOL $SRC/gnulib/gnulib-tool
4451
ENV GNULIB_SRCDIR $SRC/gnulib
4552
RUN git clone git://git.savannah.gnu.org/gnulib.git
@@ -50,6 +57,11 @@ RUN git clone --depth=1 https://git.lysator.liu.se/nettle/nettle.git
5057
RUN git clone --depth=1 https://gitlab.com/gnutls/gnutls.git
5158
RUN wget -O- https://ftp.gnu.org/pub/gnu/libmicrohttpd/libmicrohttpd-latest.tar.gz | tar xz
5259

60+
# Get a more recent version of automake as the one in the package
61+
# manager is too old for wget2.
62+
RUN curl -LO http://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automake_1.16.5-1.3_all.deb && \
63+
apt install ./automake_1.16.5-1.3_all.deb
64+
5365
RUN git clone --recursive https://gitlab.com/gnuwget/wget2.git
5466

5567
WORKDIR wget2

0 commit comments

Comments
 (0)