Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix some build issues on fedora #7

Closed
wants to merge 3 commits into from
Closed

fix some build issues on fedora #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e911a5a
Make pool flags public
Feb 28, 2012
06bbcc9
swig -DENABLE_RPMDB if RPMDB enabled.
Feb 28, 2012
b7fd545
/etc/yum.repos.d
Feb 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bindings/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ FIND_PACKAGE (SWIG)

MESSAGE (STATUS "Found SWIG version ${SWIG_VERSION}")
SET (SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/solv.i")
IF (ENABLE_RPMDB)
SET (SWIG_DEFS -DENABLE_RPMDB)
ENDIF ()

IF (ENABLE_PYTHON)
ADD_SUBDIRECTORY (python)
Expand Down
2 changes: 1 addition & 1 deletion bindings/perl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MESSAGE (STATUS "Perl installation dir: ${PERL_INSTALL_DIR}")

ADD_CUSTOM_COMMAND (
OUTPUT solv_perl.c
COMMAND ${SWIG_EXECUTABLE} -perl -I${CMAKE_SOURCE_DIR}/src -o solv_perl.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
COMMAND ${SWIG_EXECUTABLE} -perl ${SWIG_DEFS} -I${CMAKE_SOURCE_DIR}/src -o solv_perl.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
COMMAND sed -i -e "s/SvTYPE(tsv) == SVt_PVHV/SvTYPE(tsv) == SVt_PVHV || SvTYPE(tsv) == SVt_PVAV/" solv_perl.c
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/bindings/solv.i
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MESSAGE (STATUS "Python installation dir: ${PYTHON_INSTALL_DIR}")

ADD_CUSTOM_COMMAND (
OUTPUT solv_python.c
COMMAND ${SWIG_EXECUTABLE} -python -I${CMAKE_SOURCE_DIR}/src -o solv_python.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
COMMAND ${SWIG_EXECUTABLE} -python ${SWIG_DEFS} -I${CMAKE_SOURCE_DIR}/src -o solv_python.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/bindings/solv.i
)
Expand Down
2 changes: 1 addition & 1 deletion bindings/ruby/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MESSAGE (STATUS "Ruby installation dir: ${RUBY_INSTALL_DIR}")

ADD_CUSTOM_COMMAND (
OUTPUT solv_ruby.c
COMMAND ${SWIG_EXECUTABLE} -ruby -I${CMAKE_SOURCE_DIR}/src -o solv_ruby.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
COMMAND ${SWIG_EXECUTABLE} -ruby ${SWIG_DEFS} -I${CMAKE_SOURCE_DIR}/src -o solv_ruby.c ${CMAKE_SOURCE_DIR}/bindings/solv.i
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_SOURCE_DIR}/bindings/solv.i
)
Expand Down
2 changes: 1 addition & 1 deletion examples/pysolv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ if cmd == 'se':

# read all repo configs
repos = []
for reposdir in ["/etc/zypp/repos.d"]:
for reposdir in ["/etc/zypp/repos.d", "/etc/yum.repos.d"]:
if not os.path.isdir(reposdir):
continue
for reponame in sorted(glob.glob('%s/*.repo' % reposdir)):
Expand Down
2 changes: 1 addition & 1 deletion src/pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ struct _Pool {
/* search position */
Datapos pos;

#ifdef LIBSOLV_INTERNAL
/* flags to tell the library how the installed package manager works */
int promoteepoch; /* true: missing epoch is replaced by epoch of dependency */
int obsoleteusesprovides; /* true: obsoletes are matched against provides, not names */
Expand All @@ -128,6 +127,7 @@ struct _Pool {
int noinstalledobsoletes; /* true: ignore obsoletes of installed packages */
int forbidselfconflicts; /* true: packages which conflict with itself are not installable */

#ifdef LIBSOLV_INTERNAL
/* hash for rel unification */
Hashtable relhashtbl; /* hashtable: (name,evr,op)Hash -> Id */
Hashmask relhashmask;
Expand Down