| 1 |
commit: b4218d5055b8428f6b7f3a89beeeca2cfd714eaf |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Fri Dec 1 20:23:48 2017 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 02:16:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b4218d50 |
| 7 |
|
| 8 |
app-office/libreoffice: update fix-execinfo patch |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
.../libreoffice-5.4.2.2-musl-fix-execinfo.patch | 29 ++++++++++++++++------ |
| 13 |
1 file changed, 22 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch |
| 16 |
index 7b77e66..4c3b359 100644 |
| 17 |
--- a/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch |
| 18 |
+++ b/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch |
| 19 |
@@ -1,6 +1,7 @@ |
| 20 |
-diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h libreoffice-5.4.2.2/sal/osl/unx/backtrace.h |
| 21 |
---- libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h 2017-09-27 14:03:26.000000000 -0400 |
| 22 |
-+++ libreoffice-5.4.2.2/sal/osl/unx/backtrace.h 2017-11-20 04:09:46.568616084 -0500 |
| 23 |
+diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h |
| 24 |
+index 5fafc1c..408c12c 100644 |
| 25 |
+--- a/sal/osl/unx/backtrace.h |
| 26 |
++++ b/sal/osl/unx/backtrace.h |
| 27 |
@@ -20,7 +20,7 @@ |
| 28 |
#ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
| 29 |
#define INCLUDED_SAL_OSL_UNX_BACKTRACE_H |
| 30 |
@@ -10,15 +11,29 @@ diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h libreoffice-5.4.2.2/ |
| 31 |
|
| 32 |
#include <execinfo.h> |
| 33 |
|
| 34 |
-diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx libreoffice-5.4.2.2/sal/osl/unx/signal.cxx |
| 35 |
---- libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx 2017-09-27 14:03:26.000000000 -0400 |
| 36 |
-+++ libreoffice-5.4.2.2/sal/osl/unx/signal.cxx 2017-11-20 04:03:01.440227794 -0500 |
| 37 |
+diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx |
| 38 |
+index f4c9a9c..da6d9cf 100644 |
| 39 |
+--- a/sal/osl/unx/signal.cxx |
| 40 |
++++ b/sal/osl/unx/signal.cxx |
| 41 |
@@ -35,7 +35,7 @@ |
| 42 |
|
| 43 |
#endif /* MACOSX */ |
| 44 |
|
| 45 |
-#ifdef LINUX |
| 46 |
-+#if defined (LINUX) && defined (__GLIBC__) |
| 47 |
++#if defined(LINUX) && defined(__GLIBC__) |
| 48 |
#include <execinfo.h> |
| 49 |
#include <link.h> |
| 50 |
#define INCLUDE_BACKTRACE |
| 51 |
+diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c |
| 52 |
+index 1d9a58b..fd648e4 100644 |
| 53 |
+--- a/sal/osl/unx/backtrace.c |
| 54 |
++++ b/sal/osl/unx/backtrace.c |
| 55 |
+@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) |
| 56 |
+ } |
| 57 |
+ } |
| 58 |
+ |
| 59 |
+-#elif !defined LINUX |
| 60 |
++#elif !defined(__GLIBC__) |
| 61 |
+ |
| 62 |
+ int backtrace( void **buffer, int max_frames ) |
| 63 |
+ { |
Archives