Add a patch to libthr fixing mutex issues encountered with glib.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 29 insertions, 19 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/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 321ed10af815..ca82fcdd1212 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4
 AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951
@@ -15,6 +15,7 @@ AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e
 AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
 AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
 AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
+AUX freebsd-lib-9.0-trylock-adaptive.patch 439 RMD160 056ea3082ef46645c5af0374aa092f8fe68221ae SHA1 759dc8dd9975a448c79f5fffafac1838ead91516 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612
 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
 AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
 AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
@@ -61,23 +62,13 @@ EBUILD freebsd-lib-7.2-r1.ebuild 12031 RMD160 7ed76ca70dbca490d9e222c6200a825b82
 EBUILD freebsd-lib-8.0.ebuild 14711 RMD160 546c0e959156a4138331b6ba6ca0d55a53fb3a18 SHA1 c316876d83231db0d225e5b2fb49762903fee037 SHA256 a2f84d09876185ce43467375362842642a00a9400c846fa2ce587f8ec2dce981
 EBUILD freebsd-lib-8.2-r1.ebuild 15781 RMD160 6b636dac242c89a203e3bb532c6413df1614a2ab SHA1 cee76f7c3a2302a98d7fc7a3d384d9bb93ec9e70 SHA256 77b9417b08a2cecb3411284d284a7374190573fb70c7d4e540db9704d10e5083
 EBUILD freebsd-lib-9.0-r1.ebuild 16053 RMD160 5f16e81224019df01c9babb5b1dd49f76201b109 SHA1 3ce8266e607e5cc06e4b6c3581a98609f764bde3 SHA256 de7d0a8f471f0c56650bd282e570e3426f5e836df9f2181124b10e13d2ff6781
-EBUILD freebsd-lib-9.0-r2.ebuild 17077 RMD160 f16f01268f7c9f741a726c324c33852d2ec96cd6 SHA1 4e55d627df525749dbdafb18173dbbf35bfece7c SHA256 460bad3552718f104cc6aa434fcef1be89001e28bfe00d69e722d2b44dd5c45b
-MISC ChangeLog 29695 RMD160 2f813a5a81c97e54f826fc0f9c87ae149293ace6 SHA1 2ff6a4793650990f9b544b91e3df2a718371946a SHA256 cb9232b8e8ee5f05cd6cf41fb84bb65809501424828be39f140ae89c603114c8
+EBUILD freebsd-lib-9.0-r2.ebuild 17128 RMD160 19d9b7f935e85ddbc35a3afe913ec0bb284a30ed SHA1 957c53760d98bdfaa44e554ebaaa4046cb4d9db9 SHA256 2212780f589e10309085c77df204b0cb58a65e4ebc9e329569c13720e1fb3646
+MISC ChangeLog 29894 RMD160 2af1933617f47fbae7b822f100cbc5447f25f54a SHA1 c75beaf3745a24d8ce4078ce4caaa3c4bbe25bba SHA256 853c5b6e5511ff841dc112f86253293835fbd40ee8afe0c5266388ae42f5709d
 MISC metadata.xml 410 RMD160 f5d6157462d32d3397c8f69ed4d1ff37f2bd5165 SHA1 067425a31e0d87fc9e911ae203cce0fced8da77d SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPvwblAAoJEDYO1FT4VRUUKoUP/2rbW2QM3Sqk9vN7KgE0f3CT
-NGP3/TLwbFgxmhKUV+ohxU2BxZvY4uKwqRD+8QKR7O4DJLQx6RZC38f3GhbuQjbN
-bCdQr8+bOrjvSrbhfm7crBIhLcjMuAn6MPJntUtCHJ4y5vOiAoPgiXli6EiXw76+
-kgSd+esOFHucw2em8263eNhjI5zUkI79hq30DO9zug6kTWfWr9XUTPhOACkaLIHT
-5JcaGAFCoqpRB8EfVbxOQotWBtP2gOb6CHVGM5GanWCGhGQ6xNrzgdnrXGfSbgF/
-phwVYCfNFTaWR6/IvLURLbjPVHzRpnKyYhm2iUkORY2yPunCx5YHc654CUynEMzl
-QSFRj9xgTz1NDgybdJwWqYK0ENicce6TO7vSYCgZlU8BE+hovPUht/6SPJftPZKX
-1PBq8k7nZE0UUyPsru+XLlAGcUi3opAdpbclo1fJM4fmUdqq3XRUjlIcC3OfYJJm
-23D/5zD+Krmg7OcpgxHKrPdi+V9CzHGFI35vKf7ZwvqkB97Xb/Nx8n1VfMCKqsXb
-xVLssmt995DW7eEwZI6EenrrYQwcdHIl7FeKSwpZqCkoaArnfxKbFoU6tZbrKAwK
-FEJbe0RmKiXk6Ze96A1z0W/G3sR2vZJiZkqRrf1QhFyH7JD2HezeecjNOMl6oeR8
-lBTNBH2ciwNXHQKE192j
-=Tu44
+iEYEARECAAYFAk+/eeoACgkQvFcC4BYPU0qH5ACeL8lycwXLnRxnTBjPfJ3YWGbr
+l4YAoLRk0CZqrRgok2qzEMkndhIp5V9S
+=wEsE
 -----END PGP SIGNATURE-----
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: