diff options
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.12-fbsd.patch | 21 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.12.12.ebuild | 5 |
3 files changed, 30 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 12ba85159bd0..eb5ffa19cf80 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.267 2007/06/27 15:28:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.268 2007/07/06 00:31:30 dang Exp $ + + 06 Jul 2007; Daniel Gryniewicz <dang@gentoo.org> + +files/glib-2.12.12-fbsd.patch, glib-2.12.12.ebuild: + Fix gmodule issues on fbsd; bug #184301 27 Jun 2007; Mike Frysinger <vapier@gentoo.org> +files/glib-1.2.10-automake.patch, glib-1.2.10-r5.ebuild: diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch new file mode 100644 index 000000000000..bba632964ede --- /dev/null +++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch @@ -0,0 +1,21 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c +--- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400 ++++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400 +@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name, + static gpointer + _g_module_self (void) + { ++#ifndef __FreeBSD__ + gpointer handle; + + /* to query symbols from the program itself, special link options +@@ -117,6 +118,9 @@ _g_module_self (void) + g_module_set_error (fetch_dlerror (TRUE)); + + return handle; ++#else ++ return RTLD_DEFAULT; ++#endif + } + + static void diff --git a/dev-libs/glib/glib-2.12.12.ebuild b/dev-libs/glib/glib-2.12.12.ebuild index 2ec63e78c444..1180ff873dea 100644 --- a/dev-libs/glib/glib-2.12.12.ebuild +++ b/dev-libs/glib/glib-2.12.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.12.ebuild,v 1.2 2007/06/05 19:06:25 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.12.ebuild,v 1.3 2007/07/06 00:31:30 dang Exp $ inherit gnome.org libtool eutils flag-o-matic @@ -42,6 +42,9 @@ src_unpack() { fi fi + # Fix gmodule issues on fbsd; bug #184301 + epatch "${FILESDIR}"/${P}-fbsd.patch + [[ ${CHOST} == *-freebsd* ]] && elibtoolize } |