From 2c32f494ccf1721d0888bde59be41ba05e221d33 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 15 Jan 2011 22:05:29 -0600 Subject: sat-solver: upgrade to newer git version This works with rpm 5.4.0 Signed-off-by: Qing He 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 --- .../sat-solver/sat-solver/db5.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta/recipes-extended/sat-solver/sat-solver/db5.patch (limited to 'meta/recipes-extended/sat-solver/sat-solver/db5.patch') 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 @@ +RPM no longer includes an internal version of db, it now relies on the system +version. The system version in Poky is available at /usr/include/db51 + +Signed-off-by: Mark Hatle + +rebased to sat-solver commit 9e1f2a097965debebc69cebf8ed73c6ff31a5220 + +Signed-off-by: Qing He + +--- git/ext/repo_rpmdb.c.orig 2011-01-06 10:46:37.369900542 -0600 ++++ git/ext/repo_rpmdb.c 2011-01-06 10:48:35.482919434 -0600 +@@ -29,11 +29,7 @@ + #include + + #ifndef DB_CREATE +-# ifdef FEDORA +-# include +-# else +-# include +-# endif ++# include + #endif + + #include "pool.h" -- cgit v1.2.3-54-g00ecf