Date: Sat, 14 Feb 2015 21:44:43 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379023 - in branches/2015Q1/lang/qt5-qml: . files Message-ID: <201502142144.t1ELihjh099367@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Feb 14 21:44:42 2015 New Revision: 379023 URL: https://svnweb.freebsd.org/changeset/ports/379023 QAT: https://qat.redports.org/buildarchive/r379023/ Log: MFH: r378099 Add upstream commit to fix a crash in devel/qtcreator. PR: 197079 Submitted by: Alex Richardson <arichardson.kde@gmail.com> Approved by: portmgr (erwin) Added: branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 - copied unchanged from r378099, head/lang/qt5-qml/files/patch-git_cf6e9711 Modified: branches/2015Q1/lang/qt5-qml/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/lang/qt5-qml/Makefile ============================================================================== --- branches/2015Q1/lang/qt5-qml/Makefile Sat Feb 14 21:40:38 2015 (r379022) +++ branches/2015Q1/lang/qt5-qml/Makefile Sat Feb 14 21:44:42 2015 (r379023) @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- Copied: branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 (from r378099, head/lang/qt5-qml/files/patch-git_cf6e9711) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 Sat Feb 14 21:44:42 2015 (r379023, copy of r378099, head/lang/qt5-qml/files/patch-git_cf6e9711) @@ -0,0 +1,26 @@ +commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26 +Author: Alex Richardson <arichardson.kde@gmail.com> +Date: Wed Jan 21 09:10:01 2015 +0000 + + Don't crash on FreeBSD when computing stack limits + + On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling + pthread_attr_get_np() so if we don't initialize it will probably crash. + This is not a problem on glibc systems since there pthread_attr_t is an + opaque union an doesn't need to be allocated using malloc(). + + Change-Id: I227685ddf9981974ade08aee8917f7262c301787 + Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> + +--- src/qml/jsruntime/qv4engine.cpp ++++ src/qml/jsruntime/qv4engine.cpp +@@ -112,7 +112,8 @@ quintptr getStackLimit() + void* stackBottom = 0; + pthread_attr_t attr; + #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) +- if (pthread_attr_get_np(pthread_self(), &attr) == 0) { ++ // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes ++ if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { + #else + if (pthread_getattr_np(pthread_self(), &attr) == 0) { + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502142144.t1ELihjh099367>