|
 |
0ce454 |
From 67d113a76162e85c3ee75d76219a66359656087d Mon Sep 17 00:00:00 2001
|
|
|
30e226 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
30e226 |
Date: Thu, 18 Jun 2015 11:42:44 +0200
|
|
|
0ce454 |
Subject: Fix rpmdiff failure
|
|
|
30e226 |
|
|
|
30e226 |
Patchwork-id: 66323
|
|
|
30e226 |
O-Subject: [RHEL7.2 PATCH libunwind] Fix rpmdiff failure
|
|
|
30e226 |
Bugzilla: 1229359
|
|
|
30e226 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
30e226 |
RH-Acked-by: Jeff Nelson <jenelson@redhat.com>
|
|
|
30e226 |
|
|
|
30e226 |
This fixes an rpmdiff failure for libunwind. It is possible to build
|
|
|
30e226 |
a cross libunwind to e.g. work on ARM memory from x86. Because of this,
|
|
|
30e226 |
the libunwind.h file differs across architectures and rpmdiff complains
|
|
|
30e226 |
because it is installed in /usr/include.
|
|
|
30e226 |
|
|
|
30e226 |
RHEL never does cross libunwinds, so just drop the faulty include
|
|
|
30e226 |
statement.
|
|
|
30e226 |
---
|
|
|
30e226 |
include/libunwind.h.in | 13 ++++++-------
|
|
|
30e226 |
1 file changed, 6 insertions(+), 7 deletions(-)
|
|
|
30e226 |
|
|
|
30e226 |
diff --git a/include/libunwind.h.in b/include/libunwind.h.in
|
|
|
0ce454 |
index 7a56168..aad564c 100644
|
|
|
30e226 |
--- a/include/libunwind.h.in
|
|
|
30e226 |
+++ b/include/libunwind.h.in
|
|
|
30e226 |
@@ -1,7 +1,11 @@
|
|
|
30e226 |
/* Provide a real file - not a symlink - as it would cause multiarch conflicts
|
|
|
30e226 |
when multiple different arch releases are installed simultaneously. */
|
|
|
30e226 |
|
|
|
30e226 |
-#ifndef UNW_REMOTE_ONLY
|
|
|
30e226 |
+/* Fedora/RHEL does not cross-compile libunwind, so always use direct
|
|
|
30e226 |
+ * inclusion. It handles multilib better.
|
|
|
30e226 |
+ */
|
|
|
30e226 |
+#ifndef LIBUNWIND_INCLUDE_H
|
|
|
30e226 |
+#define LIBUNWIND_INCLUDE_H 1
|
|
|
30e226 |
|
|
|
30e226 |
#if defined __aarch64__
|
|
|
30e226 |
#include "libunwind-aarch64.h"
|
|
|
0ce454 |
@@ -28,9 +32,4 @@
|
|
|
30e226 |
#else
|
|
|
30e226 |
# error "Unsupported arch"
|
|
|
30e226 |
#endif
|
|
|
30e226 |
-
|
|
|
30e226 |
-#else /* UNW_REMOTE_ONLY */
|
|
|
30e226 |
-
|
|
|
30e226 |
-# include "libunwind-@arch@.h"
|
|
|
30e226 |
-
|
|
|
30e226 |
-#endif /* UNW_REMOTE_ONLY */
|
|
|
30e226 |
+#endif /* LIBUNWIND_INCLUDE_H */
|
|
|
30e226 |
--
|
|
|
0ce454 |
1.8.3.1
|
|
|
30e226 |
|