Merge branch 'master' into behaviortreecpp

Author: cktii

infra/base-images/base-builder/install_swift.sh

@@ -37,10 +37,10 @@ apt-get update && apt install -y $SWIFT_PACKAGES && \
   apt install -y $SWIFT_SYMBOLIZER_PACKAGES --no-install-recommends
 
 
-wget -q https://download.swift.org/swift-5.8.1-release/ubuntu2004/swift-5.8.1-RELEASE/swift-5.8.1-RELEASE-ubuntu20.04.tar.gz
-tar xzf swift-5.8.1-RELEASE-ubuntu20.04.tar.gz
-cp -r swift-5.8.1-RELEASE-ubuntu20.04/usr/* /usr/
-rm -rf swift-5.8.1-RELEASE-ubuntu20.04.tar.gz swift-5.8.1-RELEASE-ubuntu20.04/
+wget -q https://download.swift.org/swift-5.10.1-release/ubuntu2004/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
+tar xzf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz
+cp -r swift-5.10.1-RELEASE-ubuntu20.04/usr/* /usr/
+rm -rf swift-5.10.1-RELEASE-ubuntu20.04.tar.gz swift-5.10.1-RELEASE-ubuntu20.04/
 # TODO: Move to a seperate work dir
 git clone https://github.com/llvm/llvm-project.git
 cd llvm-project

projects/libxml2/Dockerfile

@@ -26,9 +26,17 @@ 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/