Fix pthread related build failure on Gentoo/FreeBSD, bug #150583

Package-Manager: portage-2.1.2_pre3-r2

4 files changed, 53 insertions, 14 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index ae2bf755f356..74925302518c 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.216 2006/10/09 12:23:29 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.217 2006/10/15 14:07:22 leio Exp $
+
+  15 Oct 2006; Mart Raudsepp <leio@gentoo.org>
+  +files/glib-2.12.4-tests_pthread.patch, glib-2.12.4.ebuild:
+  Fix pthread related build failure on Gentoo/FreeBSD, bug #150583
 
   09 Oct 2006; Mart Raudsepp <leio@gentoo.org>
   +files/glib-2.12.4-gtimer-fix.patch, glib-2.12.4.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index aca694829377..c8ea5ae1cfb1 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -25,6 +25,10 @@ AUX glib-2.12.4-gtimer-fix.patch 591 RMD160 06e59e200a8522975d3ad84dad6e6ac8322a
 MD5 fbeb0e6db8c939085835fd6c8ee71429 files/glib-2.12.4-gtimer-fix.patch 591
 RMD160 06e59e200a8522975d3ad84dad6e6ac8322a093b files/glib-2.12.4-gtimer-fix.patch 591
 SHA256 8415f384e702068f0d40513bc6251b709d6bbee188ad286510dd331d33db9382 files/glib-2.12.4-gtimer-fix.patch 591
+AUX glib-2.12.4-tests_pthread.patch 1307 RMD160 c964b4f034fad9c859e4892b2acade6e9f456c1d SHA1 cc39989b57e485cf8496d873cbb931018c77887f SHA256 26dbdcd8f56b355c402019c6aa5886c9b50c7cdd6ef554241a4fd0cdf690f677
+MD5 78770d17a16d7be420e8c72a9727da02 files/glib-2.12.4-tests_pthread.patch 1307
+RMD160 c964b4f034fad9c859e4892b2acade6e9f456c1d files/glib-2.12.4-tests_pthread.patch 1307
+SHA256 26dbdcd8f56b355c402019c6aa5886c9b50c7cdd6ef554241a4fd0cdf690f677 files/glib-2.12.4-tests_pthread.patch 1307
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 files/glib-2.6.3-testglib-ssp.patch 344
@@ -68,10 +72,10 @@ EBUILD glib-2.12.3.ebuild 2089 RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc S
 MD5 7e5d9e706b908d5afe99be4cfc6279f2 glib-2.12.3.ebuild 2089
 RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc glib-2.12.3.ebuild 2089
 SHA256 437f6d828286598bfe1153f983037fe11eceb6303b5839d5d7507e3536f1e156 glib-2.12.3.ebuild 2089
-EBUILD glib-2.12.4.ebuild 2194 RMD160 ee13ade1554e48dde53c29b37802529edbbe5b8a SHA1 948c18c984c0c33b136cb7bd6c9cc168b4dbdb28 SHA256 6854eb9fdccb934342e950a569b7e50b42fe5d6846bdbabef1353448dc4c6343
-MD5 8e449dea677aed2c780a7fc6d955bf0f glib-2.12.4.ebuild 2194
-RMD160 ee13ade1554e48dde53c29b37802529edbbe5b8a glib-2.12.4.ebuild 2194
-SHA256 6854eb9fdccb934342e950a569b7e50b42fe5d6846bdbabef1353448dc4c6343 glib-2.12.4.ebuild 2194
+EBUILD glib-2.12.4.ebuild 2238 RMD160 e925c34a5436907c764ce0eaa53b395e6dd6fbb0 SHA1 2497863915bd76746653999f0083e357a81ce35d SHA256 baa689fde9883855ab4060cb591ed42ab04c700126316e196e65c7992aefda15
+MD5 b52562c63a40ba142507feac7ee66ac2 glib-2.12.4.ebuild 2238
+RMD160 e925c34a5436907c764ce0eaa53b395e6dd6fbb0 glib-2.12.4.ebuild 2238
+SHA256 baa689fde9883855ab4060cb591ed42ab04c700126316e196e65c7992aefda15 glib-2.12.4.ebuild 2238
 EBUILD glib-2.6.5.ebuild 1647 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a SHA1 5647d0bedffb146a0a4e0b01753f1b87c151e7c6 SHA256 c70b2e000d7eb252871462db4beb717e16f031208f8980dece27a0c38c7c83e9
 MD5 3c669304d71f54e783024332877d71d0 glib-2.6.5.ebuild 1647
 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a glib-2.6.5.ebuild 1647
@@ -88,10 +92,10 @@ EBUILD glib-2.8.6.ebuild 1608 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 SH
 MD5 bf003c8a49124eb8f907181ee83ccf4e glib-2.8.6.ebuild 1608
 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 glib-2.8.6.ebuild 1608
 SHA256 f9c35f88a5eb9cb668edf620f234ef87dc55c080733122975068679fac7b6bed glib-2.8.6.ebuild 1608
-MISC ChangeLog 25332 RMD160 ca9df88c70c09f07b3aa9f35f08ef7098283f5a6 SHA1 3760423d792d6bf3539b31cbfb7263e47a89bf48 SHA256 d1ee7e1b8a3b24782027fd1d5969b641fc2ffd4890c7ee5aab17ed85e678109d
-MD5 bca8daeb7b26921f23d2185814b29787 ChangeLog 25332
-RMD160 ca9df88c70c09f07b3aa9f35f08ef7098283f5a6 ChangeLog 25332
-SHA256 d1ee7e1b8a3b24782027fd1d5969b641fc2ffd4890c7ee5aab17ed85e678109d ChangeLog 25332
+MISC ChangeLog 25509 RMD160 ed3abc779aa69b8b6d66dfe4f23357c34b562e3d SHA1 cd2c64ea75a6afef71fc8d6e699f2b41e5a45bc8 SHA256 4d0c215965f7f53d482ad736376131d78dc77912d355313581633e6e2f323b1c
+MD5 13f5f31ae84c22548c7165344aaa7cea ChangeLog 25509
+RMD160 ed3abc779aa69b8b6d66dfe4f23357c34b562e3d ChangeLog 25509
+SHA256 4d0c215965f7f53d482ad736376131d78dc77912d355313581633e6e2f323b1c ChangeLog 25509
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -132,7 +136,7 @@ SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFKj9QkeYb6olFHJcRArEqAKDpmp2rgnYh+/ExMpJse96MzAxzLQCdHmhR
-dA9fV62xL0+rLlczNhwNdWo=
-=XAY3
+iD8DBQFFMkBrkeYb6olFHJcRAnZvAKDwj+T2EIy4HUZUTf8IjdZnyzKClACfc4Jh
+W2Nqyd7gH+gt6+vtFrApzEs=
+=tcb6
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.12.4-tests_pthread.patch b/dev-libs/glib/files/glib-2.12.4-tests_pthread.patch
new file mode 100644
index 000000000000..3ed028fbf600
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.4-tests_pthread.patch
@@ -0,0 +1,30 @@
+Patch to fix build on Gentoo/FreeBSD
+http://bugzilla.gnome.org/show_bug.cgi?id=362328
+http://bugs.gentoo.org/show_bug.cgi?id=150583
+
+Fix will be included in upstream glib-2.12.5
+
+diff -ur glib-2.12.4.orig/tests/Makefile.am glib-2.12.4/tests/Makefile.am
+--- glib-2.12.4.orig/tests/Makefile.am	2006-05-16 02:47:23 -0300
++++ glib-2.12.4/tests/Makefile.am	2006-10-09 11:28:43 -0300
+@@ -55,7 +55,7 @@
+ testgdate_LDADD = $(libglib)
+ testgdateparser_LDADD = $(libglib)
+ unicode_normalize_LDADD = $(libglib)
+-errorcheck_mutex_test_LDADD = $(libglib) $(libgthread)
++errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
+ if ENABLE_TIMELOOP
+ timeloop_LDADD = $(libglib)
+ timeloop_closure_LDADD = $(libglib) $(libgobject)
+diff -ur glib-2.12.4.orig/tests/Makefile.in glib-2.12.4/tests/Makefile.in
+--- glib-2.12.4.orig/tests/Makefile.in	2006-10-09 11:25:51 -0300
++++ glib-2.12.4/tests/Makefile.in	2006-10-09 11:29:38 -0300
+@@ -278,7 +278,7 @@
+ testgdate_LDADD = $(libglib)
+ testgdateparser_LDADD = $(libglib)
+ unicode_normalize_LDADD = $(libglib)
+-errorcheck_mutex_test_LDADD = $(libglib) $(libgthread)
++errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
+ @ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib)
+ @ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject)
+ 
diff --git a/dev-libs/glib/glib-2.12.4.ebuild b/dev-libs/glib/glib-2.12.4.ebuild
index 9781db888455..ee5ed17efd28 100644
--- a/dev-libs/glib/glib-2.12.4.ebuild
+++ b/dev-libs/glib/glib-2.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4.ebuild,v 1.2 2006/10/09 12:23:29 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4.ebuild,v 1.3 2006/10/15 14:07:22 leio Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -44,8 +44,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-2.8.3-macos.patch"
 
-	# Fix build for FreeBSD. This fix will be included in 2.12.5
+	# Fix build for FreeBSD. These will be included in 2.12.5
 	epatch "${FILESDIR}/${P}-gtimer-fix.patch"
+	epatch "${FILESDIR}/${P}-tests_pthread.patch"
 }
 
 src_compile() {