nhorman pushed to netdump-server (master). "Fix build on AArch64 (other chain of system headers than on x86)"

[notifications at fedoraproject.org]

>From 069699023a85f918f4746b20f40020a01fdca51b Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
Date: Thu, 9 Apr 2015 15:13:09 +0200
Subject: Fix build on AArch64 (other chain of system headers than on x86)


diff --git a/netdump-do-not-redeclare-procfs.patch b/netdump-do-not-redeclare-procfs.patch
new file mode 100644
index 0000000..64faacd
--- /dev/null
+++ b/netdump-do-not-redeclare-procfs.patch
@@ -0,0 +1,21 @@
+Index: netdump-0.7.16/netdumpelf.h
+===================================================================
+--- netdump-0.7.16.orig/netdumpelf.h
++++ netdump-0.7.16/netdumpelf.h
+@@ -86,6 +86,7 @@ struct elf_prstatus
+ 
+ #endif  /* LEGACY_UNUSED */
+ 
++#ifndef _SYS_PROCFS_H
+ #define ELF_PRARGSZ	(80)	/* Number of chars for args */
+ 
+ struct elf_prpsinfo
+@@ -102,7 +103,7 @@ struct elf_prpsinfo
+ 	char	pr_fname[16];	/* filename of executable */
+ 	char	pr_psargs[ELF_PRARGSZ];	/* initial part of arg list */
+ };
+-
++#endif
+ /*
+  *  Host-platform independent data 
+  */
diff --git a/netdump-server.spec b/netdump-server.spec
index d8760ce..99d09d1 100644
--- a/netdump-server.spec
+++ b/netdump-server.spec
@@ -1,7 +1,7 @@
 Summary: Server for network kernel message logging and crash dumps
 Name: netdump-server
 Version: 0.7.16
-Release: 38%{dist}
+Release: 39%{dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
@@ -35,6 +35,7 @@ Patch11: netdump-server-default-dir.patch
 Patch12: netdump-ldflags.patch
 Patch13: netdump-server-format-security.patch
 Patch14: netdump-server-offsetof.patch
+Patch15: netdump-do-not-redeclare-procfs.patch
 
 Group: System Environment/Daemons
 
@@ -60,6 +61,7 @@ contact it and then writes the oops log and a memory dump to
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 export CFLAGS="%{optflags} `glib-config --cflags` -fPIE"
@@ -119,6 +121,9 @@ exit 0
 %doc COPYING
 
 %changelog
+* Thu Apr 09 2015 Marcin Juszkiewicz <mjuszkiewicz at redhat.com> - 0.7.16-39
+- Fix build on AArch64 (other chain of system headers than on x86)
+
 * Wed Mar 18 2015 Adam Jackson <ajax at redhat.com> 0.7.16-38
 - Drop sysvinit script from F23+
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/netdump-server.git/commit/?h=master&id=069699023a85f918f4746b20f40020a01fdca51b