aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-10-01 14:00:55 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-10-01 14:00:55 +0200
commit96e1e57fed146a3449b7070143861b7e22ba57f4 (patch)
treee2112b60694bb0b475915dc44205b7e99728e9f4
parentfd552c3dfd6510eec0464610377b1dbedc9d6562 (diff)
downloadaports-96e1e57fed146a3449b7070143861b7e22ba57f4.tar.gz
aports-96e1e57fed146a3449b7070143861b7e22ba57f4.tar.bz2
aports-96e1e57fed146a3449b7070143861b7e22ba57f4.tar.xz
community/libreoffice: fix tread stack size issue
fixes #9488
-rw-r--r--community/libreoffice/APKBUILD6
-rw-r--r--community/libreoffice/musl-stacksize.patch39
2 files changed, 43 insertions, 2 deletions
diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 9a5e0e4dd5..6ae48cda29 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libreoffice
pkgver=5.4.5.1
-pkgrel=2
+pkgrel=3
pkgdesc="LibreOffice - Meta package for the full office suite"
url="http://www.libreoffice.org/"
arch="all !s390x"
@@ -59,6 +59,7 @@ source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice
linux-musl.patch
fix-execinfo.patch
fix-includes.patch
+ musl-stacksize.patch
"
languages=""
@@ -373,4 +374,5 @@ ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c 185d60944ea767075d27247c3162b3bc-unowinreg.dll
10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a linux-musl.patch
4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch
-c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a fix-includes.patch"
+c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a fix-includes.patch
+afaaf724c7b29aedb8dda238c76fd47688fb88fe07120f71c3b75e16e583bc7f16a803a64ef18bd7750de311c6589b66d0f0348cdce26068a846ff083273e2f7 musl-stacksize.patch"
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
+