diff options
| -rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/cmake.patch | 38 |
2 files changed, 18 insertions, 22 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 4b657e5c33..9f4ecdeb99 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc @@ -165,7 +165,7 @@ SRCREV_pn-qemu-nativesdk ??= "${QEMUSRCREV}" SRCREV_pn-qemu ??= "${QEMUSRCREV}" SRCREV_pn-qemugl ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" SRCREV_pn-qemugl-nativesdk ??= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" -SRCREV_pn-sat-solver = "9e1f2a097965debebc69cebf8ed73c6ff31a5220" +SRCREV_pn-sat-solver = "20212ccd92c6b3a5a93a83da5d7d60e9c305e75c" SRCREV_pn-screenshot ??= "292" SRCREV_pn-settings-daemon ??= "0f174f463dfed500b65533e249cd22942e439c77" SRCREV_pn-swabber-native ??= "a0792390c5d6d5a5bade7ab155c80eef3f30fa52" 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) 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}") |