commit: b4218d5055b8428f6b7f3a89beeeca2cfd714eaf
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Dec 1 20:23:48 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 02:16:25 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b4218d50
app-office/libreoffice: update fix-execinfo patch
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
.../libreoffice-5.4.2.2-musl-fix-execinfo.patch | 29 ++++++++++++++++------
1 file changed, 22 insertions(+), 7 deletions(-)
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
index 7b77e66..4c3b359 100644
--- 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
@@ -1,6 +1,7 @@
-diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h
libreoffice-5.4.2.2/sal/osl/unx/backtrace.h
---- libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h 2017-09-27
14:03:26.000000000 -0400
-+++ libreoffice-5.4.2.2/sal/osl/unx/backtrace.h 2017-11-20
04:09:46.568616084 -0500
+diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
+index 5fafc1c..408c12c 100644
+--- a/sal/osl/unx/backtrace.h
++++ b/sal/osl/unx/backtrace.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
#define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
@@ -10,15 +11,29 @@ diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/backtrace.h
libreoffice-5.4.2.2/
#include <execinfo.h>
-diff -Naur libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx
libreoffice-5.4.2.2/sal/osl/unx/signal.cxx
---- libreoffice-5.4.2.2.orig/sal/osl/unx/signal.cxx 2017-09-27
14:03:26.000000000 -0400
-+++ libreoffice-5.4.2.2/sal/osl/unx/signal.cxx 2017-11-20 04:03:01.440227794
-0500
+diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
+index f4c9a9c..da6d9cf 100644
+--- a/sal/osl/unx/signal.cxx
++++ b/sal/osl/unx/signal.cxx
@@ -35,7 +35,7 @@
#endif /* MACOSX */
-#ifdef LINUX
-+#if defined (LINUX) && defined (__GLIBC__)
++#if defined(LINUX) && defined(__GLIBC__)
#include <execinfo.h>
#include <link.h>
#define INCLUDE_BACKTRACE
+diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
+index 1d9a58b..fd648e4 100644
+--- a/sal/osl/unx/backtrace.c
++++ b/sal/osl/unx/backtrace.c
+@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd
)
+ }
+ }
+
+-#elif !defined LINUX
++#elif !defined(__GLIBC__)
+
+ int backtrace( void **buffer, int max_frames )
+ {
