Skip to content

Commit

Permalink
Revert "libxml2: Disable TSCII charset in glibc (#13003)" (#13025)
Browse files Browse the repository at this point in the history
This reverts commit e007cb7.

This change didn't affect the base-runner image where it would be
needed.
  • Loading branch information
nwellnhof authored Feb 11, 2025
1 parent 023ab8b commit e9f494b
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions projects/libxml2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,9 @@ RUN apt-get update && \
make autoconf libtool pkg-config \
zlib1g-dev liblzma-dev \
$EXTRA_PACKAGES

# Build requires automake 1.16.3
RUN curl -LO http://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automake_1.16.5-1.3_all.deb && \
apt install ./automake_1.16.5-1.3_all.deb

# Disable buggy TSCII charset in glibc
RUN sed -i.orig -e '/TSCII/ s/.*/#&/' /usr/lib/x86_64-linux-gnu/gconv/gconv-modules
# For newer distros
#RUN sed -i.orig -e '/TSCII/ s/.*/#&/' /usr/lib/x86_64-linux-gnu/gconv/gconv-modules.d/gconv-modules-extra.conf
RUN iconvconfig

RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git
WORKDIR libxml2
COPY build.sh $SRC/

0 comments on commit e9f494b

Please sign in to comment.