Control: tags 865172 + patch
Control: tags 865172 + pending
Dear maintainer,
I've prepared an NMU for basilisk2 (versioned as 0.9.20120331-4.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I should cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru basilisk2-0.9.20120331/debian/changelog basilisk2-0.9.20120331/debian/changelog
--- basilisk2-0.9.20120331/debian/changelog 2018-01-06 21:36:30.000000000 +0200
+++ basilisk2-0.9.20120331/debian/changelog 2018-01-15 20:56:21.000000000 +0200
@@ -1,3 +1,11 @@
+basilisk2 (0.9.20120331-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS on armel/armhf/mips* by using ucontext_t instead
+ of the removed struct ucontext. (Closes: #865172)
+
+ -- Adrian Bunk <b...@debian.org> Mon, 15 Jan 2018 20:56:21 +0200
+
basilisk2 (0.9.20120331-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru basilisk2-0.9.20120331/debian/patches/1003_struct_ucontext.patch basilisk2-0.9.20120331/debian/patches/1003_struct_ucontext.patch
--- basilisk2-0.9.20120331/debian/patches/1003_struct_ucontext.patch 1970-01-01 02:00:00.000000000 +0200
+++ basilisk2-0.9.20120331/debian/patches/1003_struct_ucontext.patch 2018-01-15 20:56:21.000000000 +0200
@@ -0,0 +1,24 @@
+Description: Fix FTBFS on armel/armhf/mips*
+ struct ucontext was removed from glibc.
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/865172
+
+--- basilisk2-0.9.20120331.orig/src/Unix/sigsegv.cpp
++++ basilisk2-0.9.20120331/src/Unix/sigsegv.cpp
+@@ -341,14 +341,14 @@ static void powerpc_decode_instruction(i
+ #define SIGSEGV_REGISTER_FILE (unsigned long *)&SIGSEGV_CONTEXT_REGS->nip, (unsigned long *)(SIGSEGV_CONTEXT_REGS->gpr)
+ #define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
+ #elif (defined(arm) || defined(__arm__))
+-#define SIGSEGV_CONTEXT_REGS (((struct ucontext *)scp)->uc_mcontext)
++#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext)
+ #define SIGSEGV_FAULT_INSTRUCTION (SIGSEGV_CONTEXT_REGS.arm_pc)
+ #define SIGSEGV_REGISTER_FILE (&SIGSEGV_CONTEXT_REGS.arm_r0)
+ #define SIGSEGV_SKIP_INSTRUCTION arm_skip_instruction
+ #endif
+ #if (defined(mips) || defined(__mips__))
+ #include <sys/ucontext.h>
+-#define SIGSEGV_CONTEXT_REGS (((struct ucontext *)scp)->uc_mcontext)
++#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext)
+ #define SIGSEGV_FAULT_INSTRUCTION (SIGSEGV_CONTEXT_REGS.pc)
+ #define SIGSEGV_REGISTER_FILE &SIGSEGV_CONTEXT_REGS.pc, &SIGSEGV_CONTEXT_REGS.gregs[0]
+ #define SIGSEGV_SKIP_INSTRUCTION mips_skip_instruction
diff -Nru basilisk2-0.9.20120331/debian/patches/series basilisk2-0.9.20120331/debian/patches/series
--- basilisk2-0.9.20120331/debian/patches/series 2015-09-21 21:49:13.000000000 +0300
+++ basilisk2-0.9.20120331/debian/patches/series 2018-01-15 20:56:21.000000000 +0200
@@ -6,3 +6,4 @@
2002_change_makefile_in_to_enable_multiple_builds.patch
2003_allow_configure_script_building.patch
2004_build_with_gcc_5.patch
+1003_struct_ucontext.patch
