- always use the current external db4 when linking, thanks to Dan Horak for
the original patch (#464098)
This commit is contained in:
parent
c222874d03
commit
2009bcdf56
28
cyrus-sasl-2.1.22-current-db.patch
Normal file
28
cyrus-sasl-2.1.22-current-db.patch
Normal file
@ -0,0 +1,28 @@
|
||||
Always use current db when linking. (libdb.so is symlink to the current db4)
|
||||
diff -up cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db cyrus-sasl-2.1.22/cmulocal/berkdb.m4
|
||||
--- cyrus-sasl-2.1.22/cmulocal/berkdb.m4.current-db 2005-04-26 21:14:07.000000000 +0200
|
||||
+++ cyrus-sasl-2.1.22/cmulocal/berkdb.m4 2008-09-26 11:49:34.000000000 +0200
|
||||
@@ -213,10 +213,11 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
|
||||
fi
|
||||
|
||||
saved_LIBS=$LIBS
|
||||
- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
|
||||
+ for dbname in db db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
|
||||
do
|
||||
LIBS="$saved_LIBS -l$dbname"
|
||||
- AC_TRY_LINK([#include <db.h>],
|
||||
+ AC_TRY_LINK([#include <stdio.h>
|
||||
+#include <db.h>],
|
||||
[db_create(NULL, NULL, 0);],
|
||||
BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db,
|
||||
dblib="no")
|
||||
@@ -224,7 +225,8 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
|
||||
done
|
||||
if test "$dblib" = "no"; then
|
||||
LIBS="$saved_LIBS -ldb"
|
||||
- AC_TRY_LINK([#include <db.h>],
|
||||
+ AC_TRY_LINK([#include <stdio.h>
|
||||
+#include <db.h>],
|
||||
[db_open(NULL, 0, 0, 0, NULL, NULL, NULL);],
|
||||
BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db,
|
||||
dblib="no")
|
@ -4,7 +4,7 @@
|
||||
Summary: The Cyrus SASL library
|
||||
Name: cyrus-sasl
|
||||
Version: 2.1.22
|
||||
Release: 18%{?dist}
|
||||
Release: 19%{?dist}
|
||||
License: BSD
|
||||
Group: System Environment/Libraries
|
||||
# Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
|
||||
@ -28,6 +28,7 @@ Patch28: cyrus-sasl-2.1.21-keytab.patch
|
||||
Patch30: cyrus-sasl-2.1.22-rimap.patch
|
||||
Patch31: cyrus-sasl-2.1.22-kerberos4.patch
|
||||
Patch32: cyrus-sasl-2.1.22-warnings.patch
|
||||
Patch33: cyrus-sasl-2.1.22-current-db.patch
|
||||
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
|
||||
@ -145,6 +146,7 @@ chmod -x include/*.h
|
||||
%patch30 -p1 -b .rimap
|
||||
%patch31 -p1 -b .krb4
|
||||
%patch32 -p1 -b .warnings
|
||||
%patch33 -p1 -b .current-db
|
||||
|
||||
# FIXME - we remove these files directly so that we can avoid using the -f
|
||||
# flag, which has a nasty habit of overwriting files like COPYING.
|
||||
@ -379,7 +381,11 @@ fi
|
||||
%{_sbindir}/sasl2-shared-mechlist
|
||||
|
||||
%changelog
|
||||
* Wed Sep 29 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-18
|
||||
* Fri Sep 26 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-19
|
||||
- always use the current external db4 when linking,
|
||||
thanks to Dan Horak for the original patch (#464098)
|
||||
|
||||
* Wed Sep 10 2008 Tomas Mraz <tmraz@redhat.com> - 2.1.22-18
|
||||
- fix most critical build warnings (#433583)
|
||||
- use external db4
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user