From 739fa315eb7a73aa6f3c13952e3f5a5461e25502 Mon Sep 17 00:00:00 2001 From: Ales Kozumplik Date: Jul 23 2012 08:51:40 +0000 Subject: Fix Perl build. --- diff --git a/libsolv-solvi-stdbool.patch b/libsolv-solvi-stdbool.patch new file mode 100644 index 0000000..04992c7 --- /dev/null +++ b/libsolv-solvi-stdbool.patch @@ -0,0 +1,44 @@ +From 307a43cf501f6b0b9fcb258a6753afcaf05e59c7 Mon Sep 17 00:00:00 2001 +From: Ales Kozumplik +Date: Mon, 23 Jul 2012 10:44:24 +0200 +Subject: [PATCH] solv.i: new perl includes and the custom + typedefs cause gcc errors. + +Use as the default instead. +--- + bindings/solv.i | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/bindings/solv.i b/bindings/solv.i +index a5b9552..618401c 100644 +--- a/bindings/solv.i ++++ b/bindings/solv.i +@@ -331,6 +331,7 @@ typedef VALUE AppObjectPtr; + %include "typemaps.i" + + %{ ++#include + #include + #include + #include +@@ -378,9 +379,6 @@ typedef VALUE AppObjectPtr; + #define RARRAY_LEN(ary) (RARRAY(ary)->len) + #endif + +-#define true 1 +-#define false 1 +- + #define SOLVER_SOLUTION_ERASE -100 + #define SOLVER_SOLUTION_REPLACE -101 + #define SOLVER_SOLUTION_REPLACE_DOWNGRADE -102 +@@ -388,7 +386,6 @@ typedef VALUE AppObjectPtr; + #define SOLVER_SOLUTION_REPLACE_VENDORCHANGE -104 + + typedef struct chksum Chksum; +-typedef int bool; + typedef void *AppObjectPtr; + + typedef struct { +-- +1.7.10.2 + diff --git a/libsolv.spec b/libsolv.spec index fdd21c3..f741f2a 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -7,7 +7,7 @@ Name: libsolv Version: 0.0.0 -Release: 15.git%{gitrev}%{?dist} +Release: 16.git%{gitrev}%{?dist} License: BSD Url: https://github.com/openSUSE/libsolv # git clone https://github.com/openSUSE/libsolv.git @@ -15,6 +15,7 @@ Url: https://github.com/openSUSE/libsolv Source: libsolv-%{gitrev}.tar.xz Patch0: libsolv-rubyinclude.patch Patch1: libsolv-job-reasons.patch +Patch2: libsolv-solvi-stdbool.patch Group: Development/Libraries Summary: Package dependency solver BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel @@ -84,6 +85,7 @@ Perl bindings for sat solver. %setup -q -n libsolv %patch0 -p1 -b .rubyinclude %patch1 -p1 -b .jobreasons +%patch2 -p1 -b .solvistdbool %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -143,6 +145,9 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv %{python_sitearch}/* %changelog +* Mon Jul 23 2012 Aleš Kozumplík - 0.0.0-16.git1617994 +- Fix build problems with Perl bindings. + * Mon Jul 23 2012 Aleš Kozumplík - 0.0.0-15.git1617994 - Rebuilt after a failed mass rebuild.