diff options
author | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:24:04 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2012-05-25 12:24:04 +0000 |
commit | 8a8ffd56c77862b060715b42a60dabbc5f9b7a9e (patch) | |
tree | 5ba769bcf718b80472040aedb028748c1391b744 /sys-freebsd | |
parent | Re-enable rpath on prefix wrt bug 417169. (diff) | |
download | gentoo-2-8a8ffd56c77862b060715b42a60dabbc5f9b7a9e.tar.gz gentoo-2-8a8ffd56c77862b060715b42a60dabbc5f9b7a9e.tar.bz2 gentoo-2-8a8ffd56c77862b060715b42a60dabbc5f9b7a9e.zip |
Add a patch to libthr fixing mutex issues encountered with glib.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd')
-rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 6 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch | 14 | ||||
-rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild | 5 |
3 files changed, 22 insertions, 3 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index eab91ef6e098..7740e7027307 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.141 2012/05/25 04:13:19 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.142 2012/05/25 12:24:04 aballier Exp $ + + 25 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.0-r2.ebuild, + +files/freebsd-lib-9.0-trylock-adaptive.patch: + Add a patch to libthr fixing mutex issues encountered with glib. 25 May 2012; Naohiro Aota <naota@gentoo.org> freebsd-lib-8.0.ebuild, freebsd-lib-8.2-r1.ebuild, freebsd-lib-9.0-r1.ebuild, diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch new file mode 100644 index 000000000000..e72b171569a4 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.0-trylock-adaptive.patch @@ -0,0 +1,14 @@ +http://www.freebsd.org/cgi/query-pr.cgi?pr=168317 + +Index: lib/libthr/thread/thr_mutex.c +=================================================================== +--- lib/libthr/thread/thr_mutex.c (revision 235924) ++++ lib/libthr/thread/thr_mutex.c (working copy) +@@ -538,6 +538,7 @@ + switch (PMUTEX_TYPE(m->m_flags)) { + case PTHREAD_MUTEX_ERRORCHECK: + case PTHREAD_MUTEX_NORMAL: ++ case PTHREAD_MUTEX_ADAPTIVE_NP: + ret = EBUSY; + break; + diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild index 1e67073791a5..cef4d294fb45 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.27 2012/05/25 04:13:19 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.0-r2.ebuild,v 1.28 2012/05/25 12:24:04 aballier Exp $ EAPI=2 @@ -90,7 +90,8 @@ PATCHES=( "${FILESDIR}/${PN}-6.1-csu.patch" "${FILESDIR}/${PN}-8.0-rpcsec_gss.patch" "${FILESDIR}/${PN}-9.0-liblink.patch" - "${FILESDIR}/${PN}-bsdxml2expat.patch" ) + "${FILESDIR}/${PN}-bsdxml2expat.patch" + "${FILESDIR}/${PN}-9.0-trylock-adaptive.patch" ) # Here we disable and remove source which we don't need or want # In order: |