[evolution-data-server] Add patch to fix libdb configure.ac check

Milan Crha mcrha at fedoraproject.org
Mon Mar 2 10:56:59 UTC 2015


commit b3f870c25f579ce08d2114f7bdd24aed8ed48b0f
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Mar 2 11:57:13 2015 +0100

    Add patch to fix libdb configure.ac check

 ...n-data-server-3.15.91-libdb-configure-fix.patch | 28 ++++++++++++++++++++++
 evolution-data-server.spec                         |  4 ++++
 2 files changed, 32 insertions(+)
---
diff --git a/evolution-data-server-3.15.91-libdb-configure-fix.patch b/evolution-data-server-3.15.91-libdb-configure-fix.patch
new file mode 100644
index 0000000..0d45794
--- /dev/null
+++ b/evolution-data-server-3.15.91-libdb-configure-fix.patch
@@ -0,0 +1,28 @@
+diff -up evolution-data-server-3.15.91/configure.ac.ttest evolution-data-server-3.15.91/configure.ac
+--- evolution-data-server-3.15.91/configure.ac.ttest	2015-03-02 11:48:25.422252070 +0100
++++ evolution-data-server-3.15.91/configure.ac	2015-03-02 11:49:28.947798814 +0100
+@@ -634,18 +634,18 @@ AC_ARG_WITH([libdb],
+ 
+ if test "x$with_libdb" != "xno" ; then
+ 	if test "x$with_libdb" != "xyes" ; then
+-		DB_CFLAGS="-I$with_libdb/include"
+-		DB_LIBS="-L$with_libdb/lib -ldb"
++		DB_CFLAGS="$CFLAGS -I$with_libdb/include"
++		DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
+ 	else
+ 		if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
+-			DB_CFLAGS=""
+-			DB_LIBS="-ldb"
++			DB_CFLAGS="$CFLAGS"
++			DB_LIBS="$LIBS -ldb"
+ 		fi
+ 	fi
+ 
+ 	AC_MSG_CHECKING([Berkeley DB])
+-	save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
+-	save_libs=$LIBS; LIBS="$DB_LIBS"
++	save_cflags=$CFLAGS; CFLAGS="$CFLAGS $DB_CFLAGS"
++	save_libs=$LIBS; LIBS="$LIBS $DB_LIBS"
+ 	AC_LINK_IFELSE([AC_LANG_PROGRAM(
+ 		[[#include <db.h>]],
+ 		[[db_create(NULL, NULL, 0)]])],
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index cd790d8..f833a42 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -54,6 +54,8 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+Patch02: evolution-data-server-3.15.91-libdb-configure-fix.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -150,6 +152,7 @@ the functionality of the installed %{name} package.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .libdb-configure-fix
 
 %build
 %if %{ldap_support}
@@ -412,6 +415,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %changelog
 * Mon Mar 02 2015 Milan Crha <mcrha at redhat.com> - 3.15.91-1
 - Update to 3.15.91
+- Add patch to fix libdb configure.ac check
 
 * Mon Feb 16 2015 Milan Crha <mcrha at redhat.com> - 3.13.90-1
 - Update to 3.13.90


More information about the scm-commits mailing list