| 1 |
aballier 09/06/30 07:50:28 |
| 2 |
|
| 3 |
Added: gnome-keyring-2.26.1-dlopen.patch |
| 4 |
Log: |
| 5 |
Add upstream fix for building on FreeBSD, bug #271359 |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.26.1-dlopen.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gnome-keyring-2.26.1-dlopen.patch |
| 15 |
=================================================================== |
| 16 |
commit 6ddb14eef4368d63ce7055ee52718010a8f8190a |
| 17 |
Author: Stef Walter <stef@××××××××××.com> |
| 18 |
Date: Fri Jun 26 15:13:04 2009 +0000 |
| 19 |
|
| 20 |
Fix linking problem on FreeBSD. |
| 21 |
|
| 22 |
The dlopen function is in libc rather than libdl, so add a check for |
| 23 |
that in configure.in. Fixes bug #584307 |
| 24 |
|
| 25 |
diff --git a/configure.in b/configure.in |
| 26 |
index a0e1e9a..287a391 100644 |
| 27 |
--- a/configure.in |
| 28 |
+++ b/configure.in |
| 29 |
@@ -278,6 +278,17 @@ if test "$enable_pam" != "no"; then |
| 30 |
fi |
| 31 |
|
| 32 |
# -------------------------------------------------------------------- |
| 33 |
+# Find DL functionality |
| 34 |
+ |
| 35 |
+AC_CHECK_LIB(c, dlopen, DL_LIBS="", |
| 36 |
+ AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl", |
| 37 |
+ AC_MSG_ERROR([Could not find a library with the dlopen function]) |
| 38 |
+ ) |
| 39 |
+) |
| 40 |
+ |
| 41 |
+AC_SUBST(DL_LIBS) |
| 42 |
+ |
| 43 |
+# -------------------------------------------------------------------- |
| 44 |
# Disable ACL Prompts |
| 45 |
|
| 46 |
AC_ARG_ENABLE(acl-prompts, |
| 47 |
diff --git a/pkcs11/rpc-layer/Makefile.am b/pkcs11/rpc-layer/Makefile.am |
| 48 |
index 0f085f3..45da903 100644 |
| 49 |
--- a/pkcs11/rpc-layer/Makefile.am |
| 50 |
+++ b/pkcs11/rpc-layer/Makefile.am |
| 51 |
@@ -58,6 +58,6 @@ gck_rpc_daemon_standalone_SOURCES = \ |
| 52 |
gck-rpc-daemon-standalone.c |
| 53 |
|
| 54 |
gck_rpc_daemon_standalone_LDADD = \ |
| 55 |
- -ldl libgck-rpc-layer.la \ |
| 56 |
+ $(DL_LIBS) libgck-rpc-layer.la \ |
| 57 |
$(top_builddir)/common/libgkr-common.la |
Archives