summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sat-solver/sat-solver/db5.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-01-15 22:05:29 -0600
committerSaul Wold <sgw@linux.intel.com>2011-01-30 12:09:52 -0800
commit2c32f494ccf1721d0888bde59be41ba05e221d33 (patch)
tree0c06ad95a0905a05eaaa7f82a3205f0c35a8d8c7 /meta/recipes-extended/sat-solver/sat-solver/db5.patch
parentffd12fc476d6061ba1e019a1e789cf1a2d3c82e6 (diff)
downloadpoky-2c32f494ccf1721d0888bde59be41ba05e221d33.tar.gz
sat-solver: upgrade to newer git version
This works with rpm 5.4.0 Signed-off-by: Qing He <qing.he@intel.com> Update the CMAKE configuration file to find the proper DB library as used by RPM5 within Poky. Disable checking for Fedora and Debian, as this might lead to incorrect results. Merge the dso_linking_change_build_fix with the other cmake changes. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-extended/sat-solver/sat-solver/db5.patch')
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/db5.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/db5.patch b/meta/recipes-extended/sat-solver/sat-solver/db5.patch
new file mode 100644
index 0000000000..98f322ffbb
--- /dev/null
+++ b/meta/recipes-extended/sat-solver/sat-solver/db5.patch
@@ -0,0 +1,24 @@
1RPM no longer includes an internal version of db, it now relies on the system
2version. The system version in Poky is available at /usr/include/db51
3
4Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
5
6rebased to sat-solver commit 9e1f2a097965debebc69cebf8ed73c6ff31a5220
7
8Signed-off-by: Qing He <qing.he@intel.com>
9
10--- git/ext/repo_rpmdb.c.orig 2011-01-06 10:46:37.369900542 -0600
11+++ git/ext/repo_rpmdb.c 2011-01-06 10:48:35.482919434 -0600
12@@ -29,11 +29,7 @@
13 #include <rpm/rpmdb.h>
14
15 #ifndef DB_CREATE
16-# ifdef FEDORA
17-# include <db.h>
18-# else
19-# include <rpm/db.h>
20-# endif
21+# include <db.h>
22 #endif
23
24 #include "pool.h"