summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@element.io>2024-07-02 12:39:32 +0100
committerGitHub <noreply@github.com>2024-07-02 12:39:32 +0100
commit9c8f1a6d412c8178eadaf64346c6e386328ba1ea (patch)
treeb07d4222cce6b7f369af423913f43b56962c798b
parentBump types-setuptools from 69.5.0.20240423 to 70.1.0.20240627 (#17380) (diff)
downloadsynapse-9c8f1a6d412c8178eadaf64346c6e386328ba1ea.tar.xz
Fix building debian packages on non-clean checkouts (#17390)
If we leave the `.so` in place it causes the tests to fail, as it gets
picked up (instead of the newly built .so) and so fails with mismatched
GLIBC errors.
-rw-r--r--changelog.d/17390.misc1
-rw-r--r--docker/build_debian.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/17390.misc b/changelog.d/17390.misc
new file mode 100644
index 0000000000..6a4e344c5c
--- /dev/null
+++ b/changelog.d/17390.misc
@@ -0,0 +1 @@
+Fix building debian packages on non-clean checkouts.
diff --git a/docker/build_debian.sh b/docker/build_debian.sh
index 9eae38af91..00e0856c7d 100644
--- a/docker/build_debian.sh
+++ b/docker/build_debian.sh
@@ -11,6 +11,9 @@ DIST=$(cut -d ':' -f2 <<< "${distro:?}")
 cp -aT /synapse/source /synapse/build
 cd /synapse/build
 
+# Delete any existing `.so` files to ensure a clean build.
+rm -f /synapse/build/synapse/*.so
+
 # if this is a prerelease, set the Section accordingly.
 #
 # When the package is later added to the package repo, reprepro will use the