diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-03-15 22:03:33 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-16 16:45:00 +0000 |
| commit | 548574691465e23a1e787014987d730a1e294f1d (patch) | |
| tree | 6a5b7c3b763dcc5851054644a78f3e2d232ba8c6 /meta/recipes-extended/sat-solver | |
| parent | 2a852d0cdc345e2d0c04b5ddd2f6f1344814dc3a (diff) | |
| download | poky-548574691465e23a1e787014987d730a1e294f1d.tar.gz | |
sat-solver: uprev to the latest version
Upgrade to the latest git version. Also update the cmake.patch to enable
debugging in all configurations.
(From OE-Core rev: 04da04e371da12815e176c96d852e6bd6afc2b34)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sat-solver')
| -rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/cmake.patch | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch index d7b80b0846..854bd40d75 100644 --- a/meta/recipes-extended/sat-solver/sat-solver/cmake.patch +++ b/meta/recipes-extended/sat-solver/sat-solver/cmake.patch | |||
| @@ -3,9 +3,11 @@ 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 | 1/24/2011 - Disable Fedora/Debian checking/settings by Mark Hatle <mark.hatle@windriver.com> |
| 6 | 3/15/2011 - Updated to newer version of sat-solver by Mark Hatle <mark.hatle@windriver.com> | ||
| 6 | 7 | ||
| 7 | --- a/CMakeLists.txt | 8 | diff -ur git.orig/CMakeLists.txt git/CMakeLists.txt |
| 8 | +++ b/CMakeLists.txt | 9 | --- git.orig/CMakeLists.txt 2011-03-15 17:14:22.000000000 -0500 |
| 10 | +++ git/CMakeLists.txt 2011-03-15 17:20:09.648880770 -0500 | ||
| 9 | @@ -35,22 +35,15 @@ | 11 | @@ -35,22 +35,15 @@ |
| 10 | FIND_PACKAGE(Check REQUIRED) | 12 | FIND_PACKAGE(Check REQUIRED) |
| 11 | FIND_PACKAGE(ZLIB REQUIRED) | 13 | FIND_PACKAGE(ZLIB REQUIRED) |
| @@ -49,28 +51,22 @@ not building docs (need oxygen) | |||
| 49 | -ENDIF ( FEDORA ) | 51 | -ENDIF ( FEDORA ) |
| 50 | -ENDIF ( NOT DEBIAN ) | 52 | -ENDIF ( NOT DEBIAN ) |
| 51 | 53 | ||
| 52 | SET( PACKAGE "satsolver" ) | 54 | INCLUDE ( CheckFunctionExists ) |
| 53 | SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) | 55 | INCLUDE ( TestBigEndian ) |
| 54 | @@ -159,22 +153,7 @@ | 56 | @@ -164,7 +158,7 @@ |
| 55 | ADD_SUBDIRECTORY(applayer) | 57 | |
| 58 | MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") | ||
| 59 | |||
| 60 | -set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) | ||
| 61 | +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -g" ) | ||
| 62 | set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" ) | ||
| 63 | set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g3 -O0" ) | ||
| 64 | |||
| 65 | @@ -173,7 +167,7 @@ | ||
| 66 | ADD_SUBDIRECTORY(tools) | ||
| 56 | ADD_SUBDIRECTORY(tests) | 67 | ADD_SUBDIRECTORY(tests) |
| 57 | ADD_SUBDIRECTORY(examples) | 68 | ADD_SUBDIRECTORY(examples) |
| 58 | -ADD_SUBDIRECTORY(doc) | 69 | -ADD_SUBDIRECTORY(doc) |
| 59 | - | ||
| 60 | -FIND_PACKAGE(SWIG) | ||
| 61 | - | ||
| 62 | -IF ( SWIG_FOUND ) | ||
| 63 | - ADD_SUBDIRECTORY(bindings) | ||
| 64 | -ELSE ( SWIG_FOUND ) | ||
| 65 | - # for older version of swig/cmake | ||
| 66 | - FIND_PROGRAM(SWIG_EXECUTABLE | ||
| 67 | - NAMES swig-1.3 swig | ||
| 68 | - PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin | ||
| 69 | - ) | ||
| 70 | - IF ( SWIG_EXECUTABLE ) | ||
| 71 | - ADD_SUBDIRECTORY(bindings) | ||
| 72 | - ENDIF ( SWIG_EXECUTABLE ) | ||
| 73 | -ENDIF ( SWIG_FOUND ) | ||
| 74 | +#ADD_SUBDIRECTORY(doc) | 70 | +#ADD_SUBDIRECTORY(doc) |
| 75 | 71 | ||
| 76 | MESSAGE(STATUS "version: ${VERSION}") | 72 | MESSAGE(STATUS "version: ${VERSION}") |
