Add upstream fix for building on FreeBSD, bug #271359

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 58 insertions, 3 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index bff5e19c4491..083c1dacf8e1 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.147 2009/05/14 07:39:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.148 2009/06/30 07:50:28 aballier Exp $
+
+  30 Jun 2009; Alexis Ballier <aballier@gentoo.org>
+  gnome-keyring-2.26.1-r1.ebuild, +files/gnome-keyring-2.26.1-dlopen.patch:
+  Add upstream fix for building on FreeBSD, bug #271359
 
 *gnome-keyring-2.26.1-r1 (14 May 2009)
 
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
new file mode 100644
index 000000000000..8fd0aa0d6203
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch
@@ -0,0 +1,43 @@
+commit 6ddb14eef4368d63ce7055ee52718010a8f8190a
+Author: Stef Walter <stef@memberwebs.com>
+Date:   Fri Jun 26 15:13:04 2009 +0000
+
+    Fix linking problem on FreeBSD.
+    
+    The dlopen function is in libc rather than libdl, so add a check for
+    that in configure.in. Fixes bug #584307
+
+diff --git a/configure.in b/configure.in
+index a0e1e9a..287a391 100644
+--- a/configure.in
++++ b/configure.in
+@@ -278,6 +278,17 @@ if test "$enable_pam" != "no"; then
+ fi
+ 
+ # --------------------------------------------------------------------
++# Find DL functionality
++
++AC_CHECK_LIB(c, dlopen, DL_LIBS="",
++	AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl",
++		AC_MSG_ERROR([Could not find a library with the dlopen function])
++	)
++)
++
++AC_SUBST(DL_LIBS)
++
++# --------------------------------------------------------------------
+ # Disable ACL Prompts
+ 
+ AC_ARG_ENABLE(acl-prompts, 
+diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am
+index 0f085f3..45da903 100644
+--- a/pkcs11/rpc-layer/Makefile.am
++++ b/pkcs11/rpc-layer/Makefile.am
+@@ -58,6 +58,6 @@ gck_rpc_daemon_standalone_SOURCES = \
+ 	gck-rpc-daemon-standalone.c
+ 	
+ gck_rpc_daemon_standalone_LDADD = \
+-	-ldl libgck-rpc-layer.la \
++	$(DL_LIBS) libgck-rpc-layer.la \
+ 	$(top_builddir)/common/libgkr-common.la
+ 	
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
index 2bf6691ff018..7de0c6e13e42 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild,v 1.1 2009/05/14 07:39:36 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild,v 1.2 2009/06/30 07:50:28 aballier Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx
+inherit gnome2 pam virtualx eutils autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -54,6 +54,14 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# Detect where dlopen functions are rather than hardcoding -ldl
+	# Fixes build on BSD
+	# Bug #271359
+	# Gnome bug #584307
+	epatch "${FILESDIR}/${P}-dlopen.patch"
+	eautoreconf
+
 }
 
 src_test() {