Mailinglist Archive: zypp-commit (171 mails)

< Previous Next >
[zypp-commit] <libzypp> master : Adapt to satsolver helix stuff being moved to libsatsolverext.
  • From: Michael Andres <ma@xxxxxxx>
  • Date: Mon, 22 Jun 2009 16:00:52 +0200
  • Message-id: <E1MIk4v-0003sE-1s@xxxxxxxxxxxxxxxx>
ref: refs/heads/master
commit 0f417f1b17e5bc586f444aa14dd780d09ff4325f
Author: Michael Andres <ma@xxxxxxx>
Date: Mon Jun 22 16:00:52 2009 +0200

Adapt to satsolver helix stuff being moved to libsatsolverext.
---
cmake/modules/FindSatsolver.cmake | 9 ++++++++-
libzypp.spec.cmake | 2 +-
zypp/CMakeLists.txt | 2 +-
zypp/sat/detail/PoolImpl.cc | 8 ++++++++
zypp/sat/detail/PoolImpl.h | 1 -
5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/FindSatsolver.cmake
b/cmake/modules/FindSatsolver.cmake
index 890b760..846fdd0 100644
--- a/cmake/modules/FindSatsolver.cmake
+++ b/cmake/modules/FindSatsolver.cmake
@@ -20,8 +20,15 @@ FIND_LIBRARY(SATSOLVER_LIBRARY NAMES satsolver
/usr/lib
)

+FIND_LIBRARY(SATSOLVER_EXT_LIBRARY NAMES satsolverext
+ PATHS
+ ${CMAKE_INSTALL_PREFIX}/lib
+ /usr/local/lib
+ /usr/lib
+)
+
if(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY)
- MESSAGE( STATUS "satsolver found: includes in ${SATSOLVER_INCLUDE_DIR},
library in ${SATSOLVER_LIBRARY}")
+ MESSAGE( STATUS "satsolver found: includes in ${SATSOLVER_INCLUDE_DIR},
library in ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY} ")
set(SATSOLVER_FOUND TRUE)
else(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY)
MESSAGE( STATUS "** satsolver not found")
diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 2ea1858..de9dfb7 100644
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -25,7 +25,7 @@ Provides: yast2-packagemanager
Obsoletes: yast2-packagemanager
Recommends: logrotate
BuildRequires: cmake
-BuildRequires: libsatsolver-devel >= 0.14.0 openssl-devel
+BuildRequires: libsatsolver-devel >= 0.14.2 openssl-devel
BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel
graphviz hal-devel libxml2-devel

# required for testsuite, webrick
diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 96ad6ba..f14a629 100644
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -879,7 +879,7 @@ TARGET_LINK_LIBRARIES(zypp ${HAL_STORAGE_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY}
${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )
diff --git a/zypp/sat/detail/PoolImpl.cc b/zypp/sat/detail/PoolImpl.cc
index bddf9f8..f35bee4 100644
--- a/zypp/sat/detail/PoolImpl.cc
+++ b/zypp/sat/detail/PoolImpl.cc
@@ -30,6 +30,14 @@

#include "zypp/target/modalias/Modalias.h"

+extern "C"
+{
+// Workaround satsolver project not providing a common include
+// directory. (the -devel package does, but the git repo doesn't).
+// #include <satsolver/repo_helix.h>
+void repo_add_helix( ::Repo *repo, FILE *fp, int flags );
+}
+
using std::endl;

#undef ZYPP_BASE_LOGGER_LOGGROUP
diff --git a/zypp/sat/detail/PoolImpl.h b/zypp/sat/detail/PoolImpl.h
index da83ecd..003cc35 100644
--- a/zypp/sat/detail/PoolImpl.h
+++ b/zypp/sat/detail/PoolImpl.h
@@ -18,7 +18,6 @@ extern "C"
#include <satsolver/solvable.h>
#include <satsolver/poolarch.h>
#include <satsolver/repo_solv.h>
-#include <satsolver/repo_helix.h>
}
#include <iosfwd>

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages