diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2006-10-15 14:07:22 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2006-10-15 14:07:22 +0000 |
| commit | a3352648858200824ea4659b5b60292346d3e596 (patch) | |
| tree | 2d4cba3a520760163d116485e317df57dce80881 /dev-libs | |
| parent | Marked ~amd64. (diff) | |
| download | gentoo-2-a3352648858200824ea4659b5b60292346d3e596.tar.gz gentoo-2-a3352648858200824ea4659b5b60292346d3e596.tar.bz2 gentoo-2-a3352648858200824ea4659b5b60292346d3e596.zip | |
Fix pthread related build failure on Gentoo/FreeBSD, bug #150583
(Portage version: 2.1.2_pre3-r2)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.4-tests_pthread.patch | 30 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.12.4.ebuild | 5 |
3 files changed, 38 insertions, 3 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/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() { |