diff -Nru tiemu-3.04~git20220826.cda2db4+dfsg/debian/changelog tiemu-3.04~git20220826.cda2db4+dfsg/debian/changelog --- tiemu-3.04~git20220826.cda2db4+dfsg/debian/changelog 2022-12-24 13:43:32.000000000 +0000 +++ tiemu-3.04~git20220826.cda2db4+dfsg/debian/changelog 2022-12-30 10:36:41.000000000 +0000 @@ -1,3 +1,10 @@ +tiemu (3.04~git20220826.cda2db4+dfsg-2) unstable; urgency=medium + + * Fix FTBFS on riscv64 (closes: #1026981). Thanks to Eric Long + for the patch. + + -- Andreas B. Mundt Fri, 30 Dec 2022 11:36:41 +0100 + tiemu (3.04~git20220826.cda2db4+dfsg-1) unstable; urgency=medium [ Andreas B. Mundt ] diff -Nru tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/Fix-FTBFS-on-riscv64.patch tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/Fix-FTBFS-on-riscv64.patch --- tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/Fix-FTBFS-on-riscv64.patch 1970-01-01 00:00:00.000000000 +0000 +++ tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/Fix-FTBFS-on-riscv64.patch 2022-12-30 10:36:41.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix FTBFS on riscv64 (REG_A0 conflict) +Author: Eric Long +Bug: https://bugs.debian.org/1026981 +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/core/ti_sw/registers.h ++++ b/src/core/ti_sw/registers.h +@@ -32,6 +32,10 @@ + REG_D4, REG_D5, REG_D6, REG_D7, + } Ti68kDataRegister; + ++#ifdef __riscv ++#undef REG_A0 ++#endif ++ + typedef enum { + REG_A0, REG_A1, REG_A2, REG_A3, + REG_A4, REG_A5, REG_A6, REG_A7, diff -Nru tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/series tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/series --- tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/series 2022-12-24 13:43:32.000000000 +0000 +++ tiemu-3.04~git20220826.cda2db4+dfsg/debian/patches/series 2022-12-30 10:36:41.000000000 +0000 @@ -1 +1,2 @@ #FTCBFS.patch +Fix-FTBFS-on-riscv64.patch