summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@element.io>2024-07-02 12:38:29 +0100
committerGitHub <noreply@github.com>2024-07-02 12:38:29 +0100
commit5b5280e3e5e37c1cf2ed758db30f221c438cc33f (patch)
tree5e59081478715219cc6392d8bd7e89284e15f62d
parent1.110.0rc2 (diff)
downloadsynapse-5b5280e3e5e37c1cf2ed758db30f221c438cc33f.tar.xz
Fix building debian packages for sid (#17389)
Sid now defaults to python3.12, and our pinned version of cffi (1.5.1)
does not have wheels for 3.12. This installing cffi to fail as we did
not have the correct libs installed to build from source.
-rw-r--r--changelog.d/17389.misc1
-rw-r--r--docker/Dockerfile-dhvirtualenv2
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/17389.misc b/changelog.d/17389.misc
new file mode 100644
index 0000000000..7022ed93d9
--- /dev/null
+++ b/changelog.d/17389.misc
@@ -0,0 +1 @@
+Fix building debian package for debian sid.
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv
index b7679924c2..f000144567 100644
--- a/docker/Dockerfile-dhvirtualenv
+++ b/docker/Dockerfile-dhvirtualenv
@@ -73,6 +73,8 @@ RUN apt-get update -qq -o Acquire::Languages=none \
     curl \
     debhelper \
     devscripts \
+    # Required for building cffi from source.
+    libffi-dev \
     libsystemd-dev \
     lsb-release \
     pkg-config \