Control: tags -1 + patch Hi,
the attached patch fixes the FTBFS with GCC 10. Regards, Reiner
diff -Nru makedumpfile-1.6.7/debian/patches/gcc10.patch makedumpfile-1.6.7/debian/patches/gcc10.patch --- makedumpfile-1.6.7/debian/patches/gcc10.patch 1970-01-01 01:00:00.000000000 +0100 +++ makedumpfile-1.6.7/debian/patches/gcc10.patch 2020-07-23 11:55:10.000000000 +0200 @@ -0,0 +1,47 @@ +Author: Reiner Herrmann <rei...@reiner-h.de> +Description: Fix FTBFS with GCC 10 +Bug-Debian: https://bugs.debian.org/957518 + +--- a/makedumpfile.c ++++ b/makedumpfile.c +@@ -35,6 +35,9 @@ + struct srcfile_table srcfile_table; + struct save_control sc; + ++struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; ++int crash_reserved_mem_nr; ++ + struct vm_table vt = { 0 }; + struct DumpInfo *info = NULL; + struct SplitBlock *splitblock = NULL; +--- a/makedumpfile.h ++++ b/makedumpfile.h +@@ -1255,7 +1255,7 @@ + int64_t buf_size; + }; + +-struct splitting_info { ++typedef struct splitting_info { + char *name_dumpfile; + int fd_bitmap; + mdf_pfn_t start_pfn; +@@ -1264,7 +1264,7 @@ + unsigned long size_eraseinfo; + } splitting_info_t; + +-struct parallel_info { ++typedef struct parallel_info { + int fd_memory; + int fd_bitmap_memory; + int fd_bitmap; +@@ -2006,8 +2006,8 @@ + }; + + #define CRASH_RESERVED_MEM_NR 8 +-struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; +-int crash_reserved_mem_nr; ++extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; ++extern int crash_reserved_mem_nr; + + unsigned long read_vmcoreinfo_symbol(char *str_symbol); + int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); diff -Nru makedumpfile-1.6.7/debian/patches/series makedumpfile-1.6.7/debian/patches/series --- makedumpfile-1.6.7/debian/patches/series 2020-04-17 19:12:04.000000000 +0200 +++ makedumpfile-1.6.7/debian/patches/series 2020-07-23 11:50:46.000000000 +0200 @@ -1 +1,2 @@ +gcc10.patch 0002-adapt-makefile-to-debian.patch
signature.asc
Description: PGP signature
