diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-28 16:53:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-09-28 16:55:07 +0000 |
| commit | 18821e8e6f9714bf14cac60e1c23d35e3554b332 (patch) | |
| tree | 97441502eba44b7a3338a6f21f8de69ec5728a26 /community/libreoffice/musl-stacksize.patch | |
| parent | 52fda09607ab48f45774584826bb9339f00bcbd6 (diff) | |
| download | aports-18821e8e6f9714bf14cac60e1c23d35e3554b332.tar.bz2 aports-18821e8e6f9714bf14cac60e1c23d35e3554b332.tar.xz | |
community/libreoffice: upgrade to 6.1.0.3
and fix tread stack size issue
ref #9488
Diffstat (limited to 'community/libreoffice/musl-stacksize.patch')
| -rw-r--r-- | community/libreoffice/musl-stacksize.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/community/libreoffice/musl-stacksize.patch b/community/libreoffice/musl-stacksize.patch new file mode 100644 index 0000000000..9968ccbd20 --- /dev/null +++ b/community/libreoffice/musl-stacksize.patch @@ -0,0 +1,39 @@ +diff -Naur libreoffice-6.1.0.3/sal/osl/unx/thread.cxx libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx +--- libreoffice-6.1.0.3/sal/osl/unx/thread.cxx 2018-08-02 22:54:54.000000000 +0300 ++++ libreoffice-6.1.0.3-patched/sal/osl/unx/thread.cxx 2018-09-05 18:21:38.552838233 +0300 +@@ -249,7 +249,7 @@ + short nFlags) + { + Thread_Impl* pImpl; +-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) ++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) + pthread_attr_t attr; + size_t stacksize; + #endif +@@ -265,7 +265,7 @@ + + pthread_mutex_lock (&(pImpl->m_Lock)); + +-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) ++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) + if (pthread_attr_init(&attr) != 0) + return nullptr; + +@@ -282,7 +282,7 @@ + + if ((nRet = pthread_create ( + &(pImpl->m_hThread), +-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) ++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) + &attr, + #else + PTHREAD_ATTR_DEFAULT, +@@ -301,7 +301,7 @@ + return nullptr; + } + +-#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) ++#if defined OPENBSD || ((defined MACOSX || defined LINUX) && !ENABLE_RUNTIME_OPTIMIZATIONS) || (defined LINUX && !defined __GLIBC__) + pthread_attr_destroy(&attr); + #endif + |