From ab8b3ded9b6c910955a6d0e890714e2fbaec933d Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 27 Feb 2014 16:20:16 +0100 Subject: fix Pool_repo_iterator and Repo_solvable_iterator in perl bindings A perliter() call was missing. --- bindings/CMakeLists.txt | 7 +++++++ bindings/solv.i | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt index 9000773..202d7e6 100644 --- a/bindings/CMakeLists.txt +++ b/bindings/CMakeLists.txt @@ -6,8 +6,15 @@ MESSAGE (STATUS "Found SWIG version ${SWIG_VERSION}") SET (SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/solv.i") IF (ENABLE_PYTHON) + IF (ENABLE_PYTHON3) + # build for both python and python3 + SET (PythonLibs_FIND_VERSION 2) + ENDIF (ENABLE_PYTHON3) ADD_SUBDIRECTORY (python) ENDIF (ENABLE_PYTHON) +IF (ENABLE_PYTHON3) + ADD_SUBDIRECTORY (python3) +ENDIF (ENABLE_PYTHON3) IF (ENABLE_PERL) ADD_SUBDIRECTORY (perl) ENDIF (ENABLE_PERL) diff --git a/bindings/solv.i b/bindings/solv.i index 21613a2..5c0cfb8 100644 --- a/bindings/solv.i +++ b/bindings/solv.i @@ -1752,11 +1752,9 @@ rb_eval_string( } } #endif - #ifdef SWIGPERL perliter(solv::Dataiterator) #endif - %newobject __next__; Datamatch *__next__() { Dataiterator *ndi; @@ -1986,7 +1984,6 @@ rb_eval_string( } } #endif - #ifdef SWIGPERL perliter(solv::Pool_solvable_iterator) #endif @@ -2045,6 +2042,9 @@ rb_eval_string( return NULL; } } +#endif +#ifdef SWIGPERL + perliter(solv::Pool_repo_iterator) #endif %newobject __next__; Repo *__next__() { @@ -2102,6 +2102,9 @@ rb_eval_string( return NULL; } } +#endif +#ifdef SWIGPERL + perliter(solv::Repo_solvable_iterator) #endif %newobject __next__; XSolvable *__next__() { -- cgit v1.2.3