From 75ac4077ef5fec93f2628cbe669e63d3d1601c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <>
Date: Sun, 17 Mar 2024 13:15:17 -0400
Subject: [PATCH] docker: use cython, meson from pip

---
 docker/DockerfileDeps       | 4 +++-
 docker/DockerfileDepsBionic | 4 ++--
 docker/DockerfileDepsFocal  | 4 +++-
 docker/DockerfileDepsLlvm   | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index 3fcd12889..97928dd45 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -10,12 +10,14 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
         build-essential pkg-config cmake git wget \
         libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools python3-build python3-virtualenv \
+        python3-pip python3-dev python3-setuptools python3-build python3-virtualenv \
         libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
         libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
         libssl-dev libfmt-dev libasio-dev libmsgpack-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+RUN pip3 install meson Cython
+
 RUN mkdir /usr/include/nonstd \
     && wget https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp \
             -O /usr/include/nonstd/expected.hpp
diff --git a/docker/DockerfileDepsBionic b/docker/DockerfileDepsBionic
index 0d8ec965e..73673986a 100644
--- a/docker/DockerfileDepsBionic
+++ b/docker/DockerfileDepsBionic
@@ -5,12 +5,12 @@ LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendh
 RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
 RUN apt-get update && apt-get install -y \
         apt-transport-https build-essential pkg-config git wget libncurses5-dev libreadline-dev nettle-dev \
-        libgnutls28-dev libuv1-dev cython3 python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
+        libgnutls28-dev libuv1-dev python3-dev python3-setuptools libcppunit-dev libjsoncpp-dev \
         libargon2-0-dev \
         autotools-dev autoconf libfmt-dev libmsgpack-dev libssl-dev python3-pip \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
-RUN pip3 install --upgrade cmake
+RUN pip3 install --upgrade cmake meson Cython
 
 # libasio-dev (1.10) is too old
 RUN echo "** Building a recent version of asio ***" \
diff --git a/docker/DockerfileDepsFocal b/docker/DockerfileDepsFocal
index b002f4c5d..da05fd5db 100644
--- a/docker/DockerfileDepsFocal
+++ b/docker/DockerfileDepsFocal
@@ -10,12 +10,14 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
         build-essential pkg-config cmake git wget \
         libtool autotools-dev autoconf \
-        cython3 python3-dev python3-setuptools \
+        python3-dev python3-setuptools python3-pip \
         libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
         libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev \
         libssl-dev libfmt-dev libasio-dev libmsgpack-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+RUN pip3 install meson Cython
+
 RUN mkdir /usr/include/nonstd \
     && wget https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp \
             -O /usr/include/nonstd/expected.hpp
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 981c76f8c..3342ab20b 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -10,13 +10,15 @@ RUN apt-get update && apt-get install -y \
 RUN apt-get update \
     && apt-get install -y llvm llvm-dev lldb clang gdb make cmake pkg-config \
        libtool git wget libncurses5-dev libreadline-dev \
-       nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev cython3 python3-dev \
+       nettle-dev libgnutls28-dev libuv1-dev libmsgpack-dev libjsoncpp-dev python3-dev \
        python3-setuptools libcppunit-dev python3-pip python3-build python3-virtualenv \
        autotools-dev autoconf libssl-dev libargon2-dev \
        libfmt-dev libasio-dev \
     && apt-get remove -y gcc g++ && apt-get autoremove -y \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
+RUN pip3 install meson Cython
+
 ENV CC cc
 ENV CXX c++