diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-01-15 22:05:29 -0600 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-30 12:09:52 -0800 |
commit | 2c32f494ccf1721d0888bde59be41ba05e221d33 (patch) | |
tree | 0c06ad95a0905a05eaaa7f82a3205f0c35a8d8c7 /meta/recipes-extended/sat-solver/sat-solver/cmake.patch | |
parent | ffd12fc476d6061ba1e019a1e789cf1a2d3c82e6 (diff) | |
download | poky-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/cmake.patch')
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/cmake.patch | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch index a69d82590e..d7b80b0846 100644 --- a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch +++ b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch | |||
@@ -2,23 +2,56 @@ check rpm | |||
2 | not building docs (need oxygen) | 2 | not building docs (need oxygen) |
3 | 3 | ||
4 | 8/19/2010 - created by Qing He <qing.he@intel.com> | 4 | 8/19/2010 - created by Qing He <qing.he@intel.com> |
5 | 1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <mark.hatle@windriver.com> | ||
5 | 6 | ||
6 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
7 | index 24234db..69413e4 100644 | ||
8 | --- a/CMakeLists.txt | 7 | --- a/CMakeLists.txt |
9 | +++ b/CMakeLists.txt | 8 | +++ b/CMakeLists.txt |
10 | @@ -50,6 +50,10 @@ MESSAGE(STATUS "Enabling multi dist support") | 9 | @@ -35,22 +35,15 @@ |
10 | FIND_PACKAGE(Check REQUIRED) | ||
11 | FIND_PACKAGE(ZLIB REQUIRED) | ||
12 | |||
13 | -IF ( FEDORA ) | ||
14 | -MESSAGE(STATUS "Building for Fedora") | ||
15 | -ADD_DEFINITIONS( -DFEDORA ) | ||
16 | -ENDIF ( FEDORA) | ||
17 | - | ||
18 | -IF ( DEBIAN ) | ||
19 | -MESSAGE(STATUS "Building for Debian") | ||
20 | -ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS) | ||
21 | -ENDIF ( DEBIAN ) | ||
22 | - | ||
23 | IF ( MULTI_SEMANTICS ) | ||
24 | MESSAGE(STATUS "Enabling multi dist support") | ||
11 | ADD_DEFINITIONS( -DMULTI_SEMANTICS) | 25 | ADD_DEFINITIONS( -DMULTI_SEMANTICS) |
12 | ENDIF ( MULTI_SEMANTICS ) | 26 | ENDIF ( MULTI_SEMANTICS ) |
13 | 27 | ||
28 | -IF ( NOT DEBIAN ) | ||
14 | +FIND_PACKAGE(PkgConfig REQUIRED) | 29 | +FIND_PACKAGE(PkgConfig REQUIRED) |
15 | +PKG_CHECK_MODULES(RPM REQUIRED rpm) | 30 | +PKG_CHECK_MODULES(RPM REQUIRED rpm) |
16 | +INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} ) | 31 | +INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} ) |
17 | + | 32 | + |
18 | IF ( NOT DEBIAN ) | ||
19 | FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) | 33 | FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) |
20 | IF ( NOT RPMDB_LIBRARY ) | 34 | IF ( NOT RPMDB_LIBRARY ) |
21 | @@ -159,22 +163,7 @@ ADD_SUBDIRECTORY(tools) | 35 | FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm) |
36 | @@ -59,13 +52,14 @@ | ||
37 | IF ( RPMIO_LIBRARY ) | ||
38 | SET( RPMDB_LIBRARY ${RPMIO_LIBRARY} ${RPMDB_LIBRARY} ) | ||
39 | ENDIF ( RPMIO_LIBRARY ) | ||
40 | -IF ( FEDORA ) | ||
41 | +FIND_LIBRARY(RPMMISC_LIBRARY NAMES rpmmisc) | ||
42 | +IF ( RPMMISC_LIBRARY ) | ||
43 | +SET( RPMDB_LIBRARY ${RPMMISC_LIBRARY} ${RPMDB_LIBRARY} ) | ||
44 | +ENDIF ( RPMMISC_LIBRARY ) | ||
45 | FIND_LIBRARY(DB_LIBRARY NAMES db) | ||
46 | IF ( DB_LIBRARY ) | ||
47 | SET( RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY} ) | ||
48 | ENDIF ( DB_LIBRARY ) | ||
49 | -ENDIF ( FEDORA ) | ||
50 | -ENDIF ( NOT DEBIAN ) | ||
51 | |||
52 | SET( PACKAGE "satsolver" ) | ||
53 | SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) | ||
54 | @@ -159,22 +153,7 @@ | ||
22 | ADD_SUBDIRECTORY(applayer) | 55 | ADD_SUBDIRECTORY(applayer) |
23 | ADD_SUBDIRECTORY(tests) | 56 | ADD_SUBDIRECTORY(tests) |
24 | ADD_SUBDIRECTORY(examples) | 57 | ADD_SUBDIRECTORY(examples) |