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:41:32 +0000 |
commit | 04da04e371da12815e176c96d852e6bd6afc2b34 (patch) | |
tree | 7a3f9fb048f1308562acfe85c563b33d541021ab /meta/recipes-extended | |
parent | a1bb79372e75269b8d135c0018955c533ba06027 (diff) | |
download | openembedded-core-04da04e371da12815e176c96d852e6bd6afc2b34.tar.gz openembedded-core-04da04e371da12815e176c96d852e6bd6afc2b34.tar.bz2 openembedded-core-04da04e371da12815e176c96d852e6bd6afc2b34.tar.xz openembedded-core-04da04e371da12815e176c96d852e6bd6afc2b34.zip |
sat-solver: uprev to the latest version
Upgrade to the latest git version. Also update the cmake.patch to enable
debugging in all configurations.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-extended')
-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 d7b80b084..854bd40d7 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) 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> +3/15/2011 - Updated to newer version of sat-solver by Mark Hatle <mark.hatle@windriver.com> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +diff -ur git.orig/CMakeLists.txt git/CMakeLists.txt +--- git.orig/CMakeLists.txt 2011-03-15 17:14:22.000000000 -0500 ++++ git/CMakeLists.txt 2011-03-15 17:20:09.648880770 -0500 @@ -35,22 +35,15 @@ FIND_PACKAGE(Check REQUIRED) FIND_PACKAGE(ZLIB REQUIRED) @@ -49,28 +51,22 @@ not building docs (need oxygen) -ENDIF ( FEDORA ) -ENDIF ( NOT DEBIAN ) - SET( PACKAGE "satsolver" ) - SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" ) -@@ -159,22 +153,7 @@ - ADD_SUBDIRECTORY(applayer) + INCLUDE ( CheckFunctionExists ) + INCLUDE ( TestBigEndian ) +@@ -164,7 +158,7 @@ + + MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}") + +-set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall" ) ++set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -g" ) + set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -g -O3" ) + set ( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g3 -O0" ) + +@@ -173,7 +167,7 @@ + ADD_SUBDIRECTORY(tools) ADD_SUBDIRECTORY(tests) ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(doc) -- --FIND_PACKAGE(SWIG) -- --IF ( SWIG_FOUND ) -- ADD_SUBDIRECTORY(bindings) --ELSE ( SWIG_FOUND ) -- # for older version of swig/cmake -- FIND_PROGRAM(SWIG_EXECUTABLE -- NAMES swig-1.3 swig -- PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin -- ) -- IF ( SWIG_EXECUTABLE ) -- ADD_SUBDIRECTORY(bindings) -- ENDIF ( SWIG_EXECUTABLE ) --ENDIF ( SWIG_FOUND ) +#ADD_SUBDIRECTORY(doc) MESSAGE(STATUS "version: ${VERSION}") |