mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-22 22:21:19 +02:00
0e02cb55fb
Co-Authored-By: Rasmus Thomsen <oss@cogitri.dev>
Squashed commits:
community/libreoffice: force ant using OpenJDK 11
community/libreoffice: upgrade to 7.1.5.2
community/libreoffice: disable java
community/libreoffice: upgrade to 7.2.0.4
community/libreoffice: upgrade to 7.2.1.2
community/libreoffice: downgrade external skia source to expected version
community/libreoffice: fix issues with newer freetype
community/libreoffice: remove backtrace references and use vendored libcmis
Also removed sdk subpackage, doesn't seem to exist anymore
community/libreoffice: disable on armhf
/builds/alpine/aports/community/libreoffice/src/libreoffice-7.2.1.2/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/spin_lock.cpp:83:9: error: instruction requires: armv6k
YIELD_PROCESSOR;
^
community/libreoffice: build with clang rather than gcc
community/libreoffice: upgrade to 7.2.2.2
35 lines
826 B
Diff
35 lines
826 B
Diff
--- 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>
|
|
|
|
--- a/sal/osl/unx/signal.cxx
|
|
+++ b/sal/osl/unx/signal.cxx
|
|
@@ -36,7 +36,7 @@
|
|
|
|
#endif /* MACOSX */
|
|
|
|
-#ifdef LINUX
|
|
+#if defined(LINUX) && defined(__GLIBC__)
|
|
#include <execinfo.h>
|
|
#include <link.h>
|
|
#define INCLUDE_BACKTRACE
|
|
|
|
--- a/sal/osl/unx/backtrace.c
|
|
+++ b/sal/osl/unx/backtrace.c
|
|
@@ -279,7 +279,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
|
|
}
|
|
}
|
|
|
|
-#elif !defined LINUX && !defined MACOSX && !defined IOS
|
|
+#elif !defined LINUX && !defined MACOSX && !defined IOS && !defined(__GLIBC__)
|
|
|
|
int backtrace( void **buffer, int max_frames )
|
|
{
|