Merge pull request #814 from ftapajos/master

Update to debian bookworm

.github/workflows/main.yml

@@ -1144,9 +1144,9 @@ jobs:
       - name: cpython build test
         if: ${{ matrix.arch_name.cpython == 'yes' }}
         run: |
-          git clone --depth 1 --branch v3.9.13 https://github.com/python/cpython.git
+          git clone --depth 1 --branch v3.11.2 https://github.com/python/cpython.git
           cd cpython
-          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --enable-shared
+          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no --disable-ipv6 ${{ matrix.arch_name.cpython_arg }} --build=x86_64-linux-gnu --with-build-python --enable-shared
           ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
           cd ..
           rm -rf cpython

.gitignore

@@ -8,3 +8,4 @@ Dockerfile
 web-wasm/Dockerfile
 */imagefiles/*
 !imagefiles/*
+crosstool-ng/*

Dockerfile.in

@@ -1,4 +1,4 @@
-ARG DOCKER_IMAGE=debian:bullseye-slim
+ARG DOCKER_IMAGE=debian:bookworm-slim
 FROM $DOCKER_IMAGE
 
 LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"

android-arm64/Dockerfile.in

@@ -2,7 +2,7 @@ ARG ORG=dockcross
 FROM ${ORG}/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 RUN \
-  sed -i '/debian-security/d' /etc/apt/sources.list && \
+  echo Enabled: no >> /etc/apt/sources.list.d/debian.sources && \
   dpkg --add-architecture arm64 && \
   apt-get update
 

common/common.windows

@@ -61,7 +61,7 @@ RUN \
     patch \
     perl \
     pkg-config \
-    python \
+    python3 \
     ruby \
     scons \
     sed \

imagefiles/install-python-packages.sh

@@ -23,10 +23,11 @@ cd /tmp
 curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
 # https://github.com/pypa/setuptools/issues/2993
 export SETUPTOOLS_USE_DISTUTILS=stdlib
-${PYTHON} get-pip.py --ignore-installed
+# Add --break-system-packages to fix change since python 3.11: https://stackoverflow.com/a/75722775/10152334
+${PYTHON} get-pip.py --ignore-installed --break-system-packages 
 rm get-pip.py
 
-${PYTHON} -m pip install --upgrade --ignore-installed setuptools
-${PYTHON} -m pip install --ignore-installed conan meson
+${PYTHON} -m pip install --break-system-packages --upgrade --ignore-installed setuptools
+${PYTHON} -m pip install --break-system-packages --ignore-installed conan meson
 # Purge cache to save space: https://stackoverflow.com/questions/37513597/is-it-safe-to-delete-cache-pip-directory
 ${PYTHON} -m pip cache purge

linux-x64-clang/Dockerfile.in

@@ -3,13 +3,13 @@ FROM ${ORG}/base:latest
 
 LABEL maintainer="Matt McCormick matt.mccormick@kitware.com"
 
-ARG CLANG_VERSION=14
+ARG CLANG_VERSION=15
 ENV CLANG_VERSION=${CLANG_VERSION}
 
-RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
-    && echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \
-    && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \
-    && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION}  main" >> /etc/apt/sources.list \
+RUN echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main" >> /etc/apt/sources.list.d/llvm.list \
+    && echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${CLANG_VERSION} main" >> /etc/apt/sources.list.d/llvm.list \
+    && echo "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm main" >> /etc/apt/sources.list.d/llvm.list \
+    && echo "deb-src http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${CLANG_VERSION}  main" >> /etc/apt/sources.list.d/llvm.list \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
     && apt-get update \
     && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} liblld-${CLANG_VERSION}-dev \
@@ -18,6 +18,7 @@ RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /et
     && rm -rf /var/lib/apt/lists/* \
     && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
     && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \
+    && update-alternatives --remove-all cpp \
     && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \
     && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \
     && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \

web-wasi/Dockerfile.in

@@ -11,8 +11,8 @@ RUN apt-get update && \
     apt-get install -y && \
 \
     curl -sS https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
-    echo "deb [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
-    echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
+    echo "deb [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
+    echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
 \
     apt-get update && \
     apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} && \