diff options
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 not building docs (need oxygen) 8/19/2010 - created by Qing He <qing.he@intel.com> +1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <mark.hatle@windriver.com> -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24234db..69413e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -50,6 +50,10 @@ MESSAGE(STATUS "Enabling multi dist support") +@@ -35,22 +35,15 @@ + FIND_PACKAGE(Check REQUIRED) + FIND_PACKAGE(ZLIB REQUIRED) + +-IF ( FEDORA ) +-MESSAGE(STATUS "Building for Fedora") +-ADD_DEFINITIONS( -DFEDORA ) +-ENDIF ( FEDORA) +- +-IF ( DEBIAN ) +-MESSAGE(STATUS "Building for Debian") +-ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS) +-ENDIF ( DEBIAN ) +- + IF ( MULTI_SEMANTICS ) + MESSAGE(STATUS "Enabling multi dist support") ADD_DEFINITIONS( -DMULTI_SEMANTICS) ENDIF ( MULTI_SEMANTICS ) +-IF ( NOT DEBIAN ) +FIND_PACKAGE(PkgConfig REQUIRED) +PKG_CHECK_MODULES(RPM REQUIRED rpm) +INCLUDE_DIRECTORIES( ${RPM_INCLUDE_DIRS} ) + - IF ( NOT DEBIAN ) FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb) IF ( NOT RPMDB_LIBRARY ) -@@ -159,22 +163,7 @@ ADD_SUBDIRECTORY(tools) + FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm) +@@ -59,13 +52,14 @@ + IF ( RPMIO_LIBRARY ) + SET( RPMDB_LIBRARY ${RPMIO_LIBRARY} ${RPMDB_LIBRARY} ) + ENDIF ( RPMIO_LIBRARY ) +-IF ( FEDORA ) ++FIND_LIBRARY(RPMMISC_LIBRARY NAMES rpmmisc) ++IF ( RPMMISC_LIBRARY ) ++SET( RPMDB_LIBRARY ${RPMMISC_LIBRARY} ${RPMDB_LIBRARY} ) ++ENDIF ( RPMMISC_LIBRARY ) + FIND_LIBRARY(DB_LIBRARY NAMES db) + IF ( DB_LIBRARY ) + SET( RPMDB_LIBRARY ${DB_LIBRARY} ${RPMDB_LIBRARY} ) + ENDIF ( DB_LIBRARY ) +-ENDIF ( FEDORA ) +-ENDIF ( NOT DEBIAN ) + + SET( PACKAGE "satsolver" ) + SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) +@@ -159,22 +153,7 @@ ADD_SUBDIRECTORY(applayer) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(examples) |