diff options
| author | Markus Pyykkö <markus.pyykko@elisa.fi> | 2016-04-01 10:00:36 +0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-01 09:35:21 +0200 |
| commit | 4eba3be63c7d45eeda9aad46f50fedf62ac071eb (patch) | |
| tree | e33fc7d8203bd86a9d7efb74440a6eec3f453565 | |
| parent | 73bc697749db9288ad553db06707ad29671b44a6 (diff) | |
main/qt5-qtdeclarative: disable stach size checking when not using glibc
qt tries to check stack size using glibc-specific extension in pthreads
| -rw-r--r-- | main/qt5-qtdeclarative/APKBUILD | 14 | ||||
| -rw-r--r-- | main/qt5-qtdeclarative/qt-musl-stack-check.patch | 12 |
2 files changed, 21 insertions, 5 deletions
diff --git a/main/qt5-qtdeclarative/APKBUILD b/main/qt5-qtdeclarative/APKBUILD index 81965d11183..15a5ab987d0 100644 --- a/main/qt5-qtdeclarative/APKBUILD +++ b/main/qt5-qtdeclarative/APKBUILD @@ -5,7 +5,7 @@ _ver=${pkgver/_/-} _ver=${_ver/beta0/beta} _ver=${_ver/rc0/rc} _V=${_ver/rc/RC} -pkgrel=0 +pkgrel=1 pkgdesc="Qt5 - QtDeclarative component" url="http://qt-project.org/" arch="all" @@ -20,7 +20,8 @@ case $pkgver in *_beta*|*_rc*) _rel=development_releases;; *) _rel=official_releases;; esac -source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtdeclarative-opensource-src-$_V.tar.xz" +source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtdeclarative-opensource-src-$_V.tar.xz + qt-musl-stack-check.patch" _qt5_prefix=/usr/lib/qt5 _builddir="$srcdir"/qtdeclarative-opensource-src-$_V @@ -50,6 +51,9 @@ package() { } -md5sums="b7997c9d8df4ea60945229883f9ce8ed qtdeclarative-opensource-src-5.5.1.tar.xz" -sha256sums="5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 qtdeclarative-opensource-src-5.5.1.tar.xz" -sha512sums="e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf qtdeclarative-opensource-src-5.5.1.tar.xz" +md5sums="b7997c9d8df4ea60945229883f9ce8ed qtdeclarative-opensource-src-5.5.1.tar.xz +79f602972f396b4fc0a69cbd10a0e5ad qt-musl-stack-check.patch" +sha256sums="5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 qtdeclarative-opensource-src-5.5.1.tar.xz +3bfaae0e196eaa40ecfc464efa1a7162dc3809b85fcd0fbe48ae9094c6d0a39f qt-musl-stack-check.patch" +sha512sums="e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf qtdeclarative-opensource-src-5.5.1.tar.xz +0e4aa62e7dd71c60a142189d0ef5f1c1f2e6321169b93e93af9bdc0a1419c1a9f615a1061df2930ee62517be267531ad9a95ee122a97d7103e705c3a921a5411 qt-musl-stack-check.patch" diff --git a/main/qt5-qtdeclarative/qt-musl-stack-check.patch b/main/qt5-qtdeclarative/qt-musl-stack-check.patch new file mode 100644 index 00000000000..ace579c5fac --- /dev/null +++ b/main/qt5-qtdeclarative/qt-musl-stack-check.patch @@ -0,0 +1,12 @@ +--- qtdeclarative-opensource-src-5.5.1/src/qml/jsruntime/qv4engine.cpp.orig ++++ qtdeclarative-opensource-src-5.5.1/src/qml/jsruntime/qv4engine.cpp +@@ -133,7 +133,8 @@ + // Known examples: + // -HP PA-RISC + stackLimit = 0; +- ++# elif defined(Q_OS_LINUX) && !defined(__GLIBC__) ++ stackLimit = 0; + # else + pthread_attr_t attr; + #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) |