diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch b/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch index a5fab415c2..5d08d279ae 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch @@ -10,20 +10,20 @@ Signed-off-by: Yuanjie Huang <Yuanjie.Huang@windriver.com> configure.ac | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 81 insertions(+), 22 deletions(-) -diff --git a/configure.ac b/configure.ac -index 02716a0..889a425 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -547,8 +547,6 @@ else +Index: rpm/configure.ac +=================================================================== +--- rpm.orig/configure.ac ++++ rpm/configure.ac +@@ -871,8 +871,6 @@ else MYPATH=$PATH fi --DBXY=db60 +-DBXY=db61 - AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH) AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH) AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH) -@@ -560,22 +558,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/cmake, $MYPATH) +@@ -884,22 +882,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/ AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH) AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH) AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH) @@ -46,7 +46,7 @@ index 02716a0..889a425 100644 AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) -@@ -1598,13 +1580,46 @@ RPM_CHECK_LIB( +@@ -2050,13 +2032,46 @@ RPM_CHECK_LIB( dnl # Berkeley-DB & SQLite DBLIBSRCS="" @@ -56,7 +56,7 @@ index 02716a0..889a425 100644 -CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}" -RPM_CHECK_LIB( +CPPFLAGS_save="${CPPFLAGS}" -+CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-6.0" ++CPPFLAGS="${CPPFLAGS_save}" +with_db_save="${with_db}" + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -69,11 +69,11 @@ index 02716a0..889a425 100644 +]])], +[RPM_CHECK_LIB( [Berkeley-DB], [db], - [db-6.0], [db_create], [db.h], + [db-6.1], [db_create], [db.h], - [yes,external], [db3], + [yes,external], [db6], [ DBLIBSRCS="$DBLIBSRCS db3.c" -+ DBXY=db60 ++ DBXY=db61 + AM_CONDITIONAL(WITH_DB, [ true ]) + AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then @@ -86,7 +86,7 @@ index 02716a0..889a425 100644 + AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) + ])], +[with_db="${with_db_save}" -+ CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-5.3" ++ CPPFLAGS="${CPPFLAGS_save}" + RPM_CHECK_LIB( + [Berkeley-DB], [db], + [db-5.3], [db_create], [db.h], @@ -96,32 +96,32 @@ index 02716a0..889a425 100644 AM_CONDITIONAL(WITH_DB, [ true ]) AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then -@@ -1616,6 +1631,11 @@ RPM_CHECK_LIB( +@@ -2068,6 +2083,11 @@ RPM_CHECK_LIB( [ AM_CONDITIONAL(WITH_DB, [ false ]) AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) ]) +]) + -+if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then ++if test ".$ac_cv_lib_db_6_1_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then + CPPFLAGS="${CPPFLAGS_save}" +fi dnl # Sqlite external RPM_CHECK_LIB( -@@ -1627,10 +1647,11 @@ RPM_CHECK_LIB( +@@ -2078,10 +2098,11 @@ RPM_CHECK_LIB( + []) - dnl # Sqlite 3.7.0.1 from db-5.1.19 - dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS. -+if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then + dnl # Sqlite 3.8.3.1 from db-6.1.19 ++if test ".$ac_cv_lib_db_6_1_db_create" = .yes; then RPM_CHECK_LIB( [Berkeley-DB (+SQLite3)], [dbsql], - [db_sql-6.0], [sqlite3_open], [dbsql.h], + [db_sql-6.1], [sqlite3_open], [dbsql.h], - [yes,external], [db3/sql], + [yes,external], [db6/sql], [ AM_CONDITIONAL(WITH_DBSQL, [ true ]) AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library]) -@@ -1644,12 +1665,50 @@ RPM_CHECK_LIB( +@@ -2095,12 +2116,50 @@ RPM_CHECK_LIB( ], [ AM_CONDITIONAL(WITH_DBSQL, [ false ]) ]) @@ -172,6 +172,3 @@ index 02716a0..889a425 100644 AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support])) AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG])) --- -2.6.2 - |