diff options
| author | Saul Wold <sgw@linux.intel.com> | 2014-09-30 10:16:54 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-30 21:36:13 +0100 |
| commit | 58d9c4e4babbefecc187be2d7f1b812b76d6efc9 (patch) | |
| tree | 4f6ee75962b5c79fa754730f3e6847751fabc42a /meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch | |
| parent | 6be3386e78ec8aac1fd1631047ddf967f4843f3d (diff) | |
| download | poky-58d9c4e4babbefecc187be2d7f1b812b76d6efc9.tar.gz | |
rpm: add version 4.11.2
add patch to remove db3 from configure.ac
add inherit pkgconfig
(From OE-Core rev: 9a17f938e738a16a1ef9a00be6a8317d71f92573)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch b/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch new file mode 100644 index 0000000000..2640e54b5b --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm-4.11.2/remove-db3-from-configure.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | |||
| 2 | Disable configuring the db3 directory since we will be using the | ||
| 3 | external DB provided as part of OE-Core already, no need to have | ||
| 4 | duplicate database code. | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [OE-Core Specific] | ||
| 7 | |||
| 8 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 9 | |||
| 10 | Index: rpm-4.11.2/configure.ac | ||
| 11 | =================================================================== | ||
| 12 | --- rpm-4.11.2.orig/configure.ac | ||
| 13 | +++ rpm-4.11.2/configure.ac | ||
| 14 | @@ -825,9 +825,9 @@ AC_SUBST(RPMCONFIGDIR) | ||
| 15 | |||
| 16 | AC_SUBST(OBJDUMP) | ||
| 17 | |||
| 18 | -if test "$with_external_db" = no; then | ||
| 19 | - AC_CONFIG_SUBDIRS(db3) | ||
| 20 | -fi | ||
| 21 | +#if test "$with_external_db" = no; then | ||
| 22 | +# AC_CONFIG_SUBDIRS(db3) | ||
| 23 | +#fi | ||
| 24 | |||
| 25 | AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) | ||
| 26 | AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no]) | ||
