diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-31 12:30:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-10-31 13:52:49 +0000 |
| commit | 1debf4177eb4fb88154851f53aeaff760e7631d1 (patch) | |
| tree | 42620e2ec2d844e60544aeee7801841bce145f44 /community/libreoffice/fix-execinfo.patch | |
| parent | 7344a1249dae6e939e1af674432113a582b75cfe (diff) | |
| download | aports-1debf4177eb4fb88154851f53aeaff760e7631d1.tar.bz2 aports-1debf4177eb4fb88154851f53aeaff760e7631d1.tar.xz | |
community/libreoffice: upgrade to 5.4.2.2
Diffstat (limited to 'community/libreoffice/fix-execinfo.patch')
| -rw-r--r-- | community/libreoffice/fix-execinfo.patch | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/community/libreoffice/fix-execinfo.patch b/community/libreoffice/fix-execinfo.patch index 01fca6fb2e..4c3b359174 100644 --- a/community/libreoffice/fix-execinfo.patch +++ b/community/libreoffice/fix-execinfo.patch @@ -1,24 +1,39 @@ -diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h ---- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/backtrace.h 2015-02-02 17:06:27.765494731 -0200 -@@ -47,7 +47,7 @@ - - #endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */ +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 -#if defined (LINUX) +#if defined (LINUX) && defined (__GLIBC__) + #include <execinfo.h> - #endif -diff -ru sal.orig/osl/unx/signal.cxx sal/osl/unx/signal.cxx ---- a/sal/osl/unx/signal.cxx 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/signal.cxx 2015-02-02 17:06:53.495496086 -0200 -@@ -36,7 +36,7 @@ +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 ) + { |