diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2006-10-09 12:23:29 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2006-10-09 12:23:29 +0000 |
| commit | 3388792e26bfaef54d69615196d0c58a39b1c62f (patch) | |
| tree | 4e6053625e9d538abe075b5894b2dda8005879bd | |
| parent | Mask again -fomit-frame-poointer as per bug #150413 and 148965. (diff) | |
| download | gentoo-2-3388792e26bfaef54d69615196d0c58a39b1c62f.tar.gz gentoo-2-3388792e26bfaef54d69615196d0c58a39b1c62f.tar.bz2 gentoo-2-3388792e26bfaef54d69615196d0c58a39b1c62f.zip | |
Fix gtimer build on Gentoo/FreeBSD, bug #150557
(Portage version: 2.1.2_pre2-r6)
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch | 18 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.12.4.ebuild | 7 |
3 files changed, 28 insertions, 3 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 15108a10ad45..ae2bf755f356 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.215 2006/10/06 23:44:39 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.216 2006/10/09 12:23:29 leio Exp $ + + 09 Oct 2006; Mart Raudsepp <leio@gentoo.org> + +files/glib-2.12.4-gtimer-fix.patch, glib-2.12.4.ebuild: + Fix gtimer build on Gentoo/FreeBSD, bug #150557 *glib-2.12.4 (06 Oct 2006) diff --git a/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch b/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch new file mode 100644 index 000000000000..86555989a874 --- /dev/null +++ b/dev-libs/glib/files/glib-2.12.4-gtimer-fix.patch @@ -0,0 +1,18 @@ +http://cvs.gnome.org/viewcvs/glib/glib/gtimer.c?r1=1.29.2.3&r2=1.29.2.4 +Fix a typo (read: build on G/FBSD) +=================================================================== +RCS file: /cvs/gnome/glib/glib/gtimer.c,v +retrieving revision 1.29.2.3 +retrieving revision 1.29.2.4 +diff -u -r1.29.2.3 -r1.29.2.4 +--- glib/gtimer.c 2006/10/01 05:51:15 1.29.2.3 ++++ glib/gtimer.c 2006/10/06 18:44:33 1.29.2.4 +@@ -257,7 +257,7 @@ + + if (microseconds) + *microseconds = (elapsed / 10) % 1000000; +-#elif HAVE_CLOCK_GETTIME ++#elif USE_CLOCK_GETTIME + if (timer->active) + GETTIME (timer->end); + diff --git a/dev-libs/glib/glib-2.12.4.ebuild b/dev-libs/glib/glib-2.12.4.ebuild index c046486ca749..9781db888455 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.1 2006/10/06 23:44:39 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.4.ebuild,v 1.2 2006/10/09 12:23:29 leio Exp $ inherit gnome.org libtool eutils flag-o-matic debug @@ -42,7 +42,10 @@ src_unpack() { fi fi - epatch ${FILESDIR}/${PN}-2.8.3-macos.patch + epatch "${FILESDIR}/${PN}-2.8.3-macos.patch" + + # Fix build for FreeBSD. This fix will be included in 2.12.5 + epatch "${FILESDIR}/${P}-gtimer-fix.patch" } src_compile() { |