diff -Nru openmsx-17.0/debian/changelog openmsx-17.0/debian/changelog
--- openmsx-17.0/debian/changelog	2021-07-24 15:17:41.000000000 +0000
+++ openmsx-17.0/debian/changelog	2021-08-18 08:38:10.000000000 +0000
@@ -1,3 +1,9 @@
+openmsx (17.0-1ubuntu2) impish; urgency=medium
+
+  * Hardcode sigStackSize to 32768 to avoid test failure with glibc 2.34
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Wed, 18 Aug 2021 08:38:10 +0000
+
 openmsx (17.0-1ubuntu1) impish; urgency=medium
 
   * Really enable build on riscv64
diff -Nru openmsx-17.0/debian/patches/glibc2.34.patch openmsx-17.0/debian/patches/glibc2.34.patch
--- openmsx-17.0/debian/patches/glibc2.34.patch	1970-01-01 00:00:00.000000000 +0000
+++ openmsx-17.0/debian/patches/glibc2.34.patch	2021-08-18 08:38:10.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Hardcode sigStackSize to 32768 to avoid test failure with glibc 2.34
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2021-08-18
+
+--- a/Contrib/catch2/catch.hpp
++++ b/Contrib/catch2/catch.hpp
+@@ -10450,7 +10450,7 @@
+ 
+     // 32kb for the alternate stack seems to be sufficient. However, this value
+     // is experimentally determined, so that's not guaranteed.
+-    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
++    static constexpr std::size_t sigStackSize = 32768;
+ 
+     static SignalDefs signalDefs[] = {
+         { SIGINT,  "SIGINT - Terminal interrupt signal" },
diff -Nru openmsx-17.0/debian/patches/series openmsx-17.0/debian/patches/series
--- openmsx-17.0/debian/patches/series	2021-07-24 15:17:41.000000000 +0000
+++ openmsx-17.0/debian/patches/series	2021-08-18 06:55:17.000000000 +0000
@@ -4,3 +4,4 @@
 use-packaged-font.diff
 dmk-build-rules.diff
 really-enable-riscv64.patch
+glibc2.34.patch