diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-db5-or-db6.patch | |
parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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> | |||
10 | configure.ac | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------- | 10 | configure.ac | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------- |
11 | 1 file changed, 81 insertions(+), 22 deletions(-) | 11 | 1 file changed, 81 insertions(+), 22 deletions(-) |
12 | 12 | ||
13 | diff --git a/configure.ac b/configure.ac | 13 | Index: rpm/configure.ac |
14 | index 02716a0..889a425 100644 | 14 | =================================================================== |
15 | --- a/configure.ac | 15 | --- rpm.orig/configure.ac |
16 | +++ b/configure.ac | 16 | +++ rpm/configure.ac |
17 | @@ -547,8 +547,6 @@ else | 17 | @@ -871,8 +871,6 @@ else |
18 | MYPATH=$PATH | 18 | MYPATH=$PATH |
19 | fi | 19 | fi |
20 | 20 | ||
21 | -DBXY=db60 | 21 | -DBXY=db61 |
22 | - | 22 | - |
23 | AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH) | 23 | AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH) |
24 | AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH) | 24 | AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH) |
25 | AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH) | 25 | AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH) |
26 | @@ -560,22 +558,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/cmake, $MYPATH) | 26 | @@ -884,22 +882,6 @@ AC_PATH_PROG(__CMAKE, cmake, %{_bindir}/ |
27 | AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH) | 27 | AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH) |
28 | AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH) | 28 | AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH) |
29 | AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH) | 29 | AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH) |
@@ -46,7 +46,7 @@ index 02716a0..889a425 100644 | |||
46 | AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) | 46 | AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH) |
47 | AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) | 47 | AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH) |
48 | AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) | 48 | AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH) |
49 | @@ -1598,13 +1580,46 @@ RPM_CHECK_LIB( | 49 | @@ -2050,13 +2032,46 @@ RPM_CHECK_LIB( |
50 | 50 | ||
51 | dnl # Berkeley-DB & SQLite | 51 | dnl # Berkeley-DB & SQLite |
52 | DBLIBSRCS="" | 52 | DBLIBSRCS="" |
@@ -56,7 +56,7 @@ index 02716a0..889a425 100644 | |||
56 | -CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}" | 56 | -CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}" |
57 | -RPM_CHECK_LIB( | 57 | -RPM_CHECK_LIB( |
58 | +CPPFLAGS_save="${CPPFLAGS}" | 58 | +CPPFLAGS_save="${CPPFLAGS}" |
59 | +CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-6.0" | 59 | +CPPFLAGS="${CPPFLAGS_save}" |
60 | +with_db_save="${with_db}" | 60 | +with_db_save="${with_db}" |
61 | + | 61 | + |
62 | +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | 62 | +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ |
@@ -69,11 +69,11 @@ index 02716a0..889a425 100644 | |||
69 | +]])], | 69 | +]])], |
70 | +[RPM_CHECK_LIB( | 70 | +[RPM_CHECK_LIB( |
71 | [Berkeley-DB], [db], | 71 | [Berkeley-DB], [db], |
72 | [db-6.0], [db_create], [db.h], | 72 | [db-6.1], [db_create], [db.h], |
73 | - [yes,external], [db3], | 73 | - [yes,external], [db3], |
74 | + [yes,external], [db6], | 74 | + [yes,external], [db6], |
75 | [ DBLIBSRCS="$DBLIBSRCS db3.c" | 75 | [ DBLIBSRCS="$DBLIBSRCS db3.c" |
76 | + DBXY=db60 | 76 | + DBXY=db61 |
77 | + AM_CONDITIONAL(WITH_DB, [ true ]) | 77 | + AM_CONDITIONAL(WITH_DB, [ true ]) |
78 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) | 78 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) |
79 | + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then | 79 | + if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
@@ -86,7 +86,7 @@ index 02716a0..889a425 100644 | |||
86 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) | 86 | + AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) |
87 | + ])], | 87 | + ])], |
88 | +[with_db="${with_db_save}" | 88 | +[with_db="${with_db_save}" |
89 | + CPPFLAGS="${CPPFLAGS_save} -I${prefix}/include/db-5.3" | 89 | + CPPFLAGS="${CPPFLAGS_save}" |
90 | + RPM_CHECK_LIB( | 90 | + RPM_CHECK_LIB( |
91 | + [Berkeley-DB], [db], | 91 | + [Berkeley-DB], [db], |
92 | + [db-5.3], [db_create], [db.h], | 92 | + [db-5.3], [db_create], [db.h], |
@@ -96,32 +96,32 @@ index 02716a0..889a425 100644 | |||
96 | AM_CONDITIONAL(WITH_DB, [ true ]) | 96 | AM_CONDITIONAL(WITH_DB, [ true ]) |
97 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) | 97 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ]) |
98 | if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then | 98 | if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then |
99 | @@ -1616,6 +1631,11 @@ RPM_CHECK_LIB( | 99 | @@ -2068,6 +2083,11 @@ RPM_CHECK_LIB( |
100 | [ AM_CONDITIONAL(WITH_DB, [ false ]) | 100 | [ AM_CONDITIONAL(WITH_DB, [ false ]) |
101 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) | 101 | AM_CONDITIONAL(WITH_DB_INTERNAL, [ false ]) |
102 | ]) | 102 | ]) |
103 | +]) | 103 | +]) |
104 | + | 104 | + |
105 | +if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then | 105 | +if test ".$ac_cv_lib_db_6_1_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then |
106 | + CPPFLAGS="${CPPFLAGS_save}" | 106 | + CPPFLAGS="${CPPFLAGS_save}" |
107 | +fi | 107 | +fi |
108 | 108 | ||
109 | dnl # Sqlite external | 109 | dnl # Sqlite external |
110 | RPM_CHECK_LIB( | 110 | RPM_CHECK_LIB( |
111 | @@ -1627,10 +1647,11 @@ RPM_CHECK_LIB( | 111 | @@ -2078,10 +2098,11 @@ RPM_CHECK_LIB( |
112 | []) | ||
112 | 113 | ||
113 | dnl # Sqlite 3.7.0.1 from db-5.1.19 | 114 | dnl # Sqlite 3.8.3.1 from db-6.1.19 |
114 | dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS. | 115 | +if test ".$ac_cv_lib_db_6_1_db_create" = .yes; then |
115 | +if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then | ||
116 | RPM_CHECK_LIB( | 116 | RPM_CHECK_LIB( |
117 | [Berkeley-DB (+SQLite3)], [dbsql], | 117 | [Berkeley-DB (+SQLite3)], [dbsql], |
118 | [db_sql-6.0], [sqlite3_open], [dbsql.h], | 118 | [db_sql-6.1], [sqlite3_open], [dbsql.h], |
119 | - [yes,external], [db3/sql], | 119 | - [yes,external], [db3/sql], |
120 | + [yes,external], [db6/sql], | 120 | + [yes,external], [db6/sql], |
121 | [ | 121 | [ |
122 | AM_CONDITIONAL(WITH_DBSQL, [ true ]) | 122 | AM_CONDITIONAL(WITH_DBSQL, [ true ]) |
123 | AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library]) | 123 | AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library]) |
124 | @@ -1644,12 +1665,50 @@ RPM_CHECK_LIB( | 124 | @@ -2095,12 +2116,50 @@ RPM_CHECK_LIB( |
125 | ], [ | 125 | ], [ |
126 | AM_CONDITIONAL(WITH_DBSQL, [ false ]) | 126 | AM_CONDITIONAL(WITH_DBSQL, [ false ]) |
127 | ]) | 127 | ]) |
@@ -172,6 +172,3 @@ index 02716a0..889a425 100644 | |||
172 | AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support])) | 172 | AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support])) |
173 | AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG])) | 173 | AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG])) |
174 | 174 | ||
175 | -- | ||
176 | 2.6.2 | ||
177 | |||