From 7629a9be6a3cbae68ec04fd7b785a39c9b8f74da Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 26 Dec 2019 22:39:22 +0100
Subject: [PATCH] makedumpfile: rebuild for newer elfutils and fix on ppc32

---
 srcpkgs/makedumpfile/patches/libebl.patch | 27 +++++++++++
 srcpkgs/makedumpfile/patches/ppc32.patch  | 57 +++++++++++++++++++++++
 srcpkgs/makedumpfile/template             |  2 +-
 3 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/makedumpfile/patches/libebl.patch
 create mode 100644 srcpkgs/makedumpfile/patches/ppc32.patch

diff --git a/srcpkgs/makedumpfile/patches/libebl.patch b/srcpkgs/makedumpfile/patches/libebl.patch
new file mode 100644
index 00000000000..a69fd47dbe4
--- /dev/null
+++ b/srcpkgs/makedumpfile/patches/libebl.patch
@@ -0,0 +1,27 @@
+From fe0f221167cffd6fdea67071bd7b13f3abcee93b Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 26 Dec 2019 22:24:13 +0100
+Subject: [PATCH] Remove libebl linkage
+
+Since a recent version of elfutils libebl is a part of libdw, so
+this is necessary to fix build.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git Makefile Makefile
+index 1fdb628..df21b93 100644
+--- Makefile
++++ Makefile
+@@ -50,7 +50,7 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
+ SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c
+ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
+ 
+-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
++LIBS = -ldw -lbz2 -ldl -lelf -lz
+ ifneq ($(LINKTYPE), dynamic)
+ LIBS := -static $(LIBS)
+ endif
+-- 
+2.24.0
+
diff --git a/srcpkgs/makedumpfile/patches/ppc32.patch b/srcpkgs/makedumpfile/patches/ppc32.patch
new file mode 100644
index 00000000000..f8ade55b029
--- /dev/null
+++ b/srcpkgs/makedumpfile/patches/ppc32.patch
@@ -0,0 +1,57 @@
+From e86621dc05fa00ecea168b1cc5e18d6c66b69c7b Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 26 Dec 2019 22:33:12 +0100
+Subject: [PATCH] Fix definitions for ppc32
+
+---
+ arch/ppc.c     | 2 +-
+ makedumpfile.h | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git arch/ppc.c arch/ppc.c
+index 37c6a3b..4130c2d 100644
+--- arch/ppc.c
++++ arch/ppc.c
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#ifdef __powerpc32__
++#if defined(__powerpc__) && !defined(__powerpc64__)
+ 
+ #include "../print_info.h"
+ #include "../elf_info.h"
+diff --git makedumpfile.h makedumpfile.h
+index 24b2f69..d802833 100644
+--- makedumpfile.h
++++ makedumpfile.h
+@@ -765,7 +765,7 @@ unsigned long get_kvbase_arm64(void);
+ 
+ #endif
+ 
+-#ifdef __powerpc32__
++#if defined(__powerpc__) && !defined(__powerpc64__)
+ 
+ #define __PAGE_OFFSET		(0xc0000000)
+ #define KERNELBASE		PAGE_OFFSET
+@@ -1054,7 +1054,7 @@ int arch_crashkernel_mem_size_ppc64(void);
+ #define arch_crashkernel_mem_size()	arch_crashkernel_mem_size_ppc64()
+ #endif          /* powerpc64 */
+ 
+-#ifdef __powerpc32__ /* powerpc32 */
++#if defined(__powerpc__) && !defined(__powerpc64__)
+ int get_machdep_info_ppc(void);
+ unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr);
+ #define find_vmemmap()		stub_false()
+@@ -2149,7 +2149,7 @@ int get_xen_info_ia64(void);
+ 
+ #endif	/* __ia64 */
+ 
+-#if defined(__powerpc64__) || defined(__powerpc32__) /* powerpcXX */
++#ifdef __powerpc__ /* powerpcXX */
+ #define kvtop_xen(X)	FALSE
+ #define get_xen_basic_info_arch(X) FALSE
+ #define get_xen_info_arch(X) FALSE
+-- 
+2.24.0
+
diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index e5e44ff6ee1..9c2c9ccae59 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,7 +1,7 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
 version=1.6.6
-revision=1
+revision=2
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
 short_desc="Make a small dumpfile of kdump"