diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-08-19 03:38:17 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-08-19 03:38:17 +0000 |
| commit | cb6f083b369ee59de217c0504d471124d533325d (patch) | |
| tree | 28e404754d754f3a852831d2b649010f70695e01 /user/libreoffice/fix-execinfo.patch | |
| parent | 7ef2ed32d3d4442463f39d31380cff9432608231 (diff) | |
| parent | c5975fc819d7b79180a3627a87974da9d18685e3 (diff) | |
| download | packages-cb6f083b369ee59de217c0504d471124d533325d.tar.gz packages-cb6f083b369ee59de217c0504d471124d533325d.tar.bz2 packages-cb6f083b369ee59de217c0504d471124d533325d.tar.xz packages-cb6f083b369ee59de217c0504d471124d533325d.zip | |
Merge branch 'libreoffice' into 'master'
LibreOffice and dependencies
I have made a deal with Satan.
See merge request !44
Diffstat (limited to 'user/libreoffice/fix-execinfo.patch')
| -rw-r--r-- | user/libreoffice/fix-execinfo.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/user/libreoffice/fix-execinfo.patch b/user/libreoffice/fix-execinfo.patch new file mode 100644 index 000000000..4c3b35917 --- /dev/null +++ b/user/libreoffice/fix-execinfo.patch @@ -0,0 +1,39 @@ +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> + +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__) + #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 ) + { |