summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-02-09 16:07:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-10 14:38:44 +0000
commit84983afa63d3f155314083192aba3e6e5c9268dd (patch)
treed3660037a2cf47365516085b43831aeefb5884c3 /meta
parenta142cbd47eb78b4ea63459286d97ab5e769c7bdc (diff)
downloadpoky-84983afa63d3f155314083192aba3e6e5c9268dd.tar.gz
sat-solver: Fix build with zlib 1.2.6
(From OE-Core rev: 6064f6bd7c28640db59a216aa578f3cca6219b1f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch57
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb3
2 files changed, 59 insertions, 1 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch b/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
new file mode 100644
index 0000000000..402d16ec56
--- /dev/null
+++ b/meta/recipes-extended/sat-solver/sat-solver/0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch
@@ -0,0 +1,57 @@
1From bbbb4fb9b7c85fde90608710dff09480696c6567 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 9 Feb 2012 16:01:56 -0800
4Subject: [PATCH] sat_xfopen.c: Forward port to zlib 1.2.6 gzFile
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9---
10 ext/sat_xfopen.c | 10 +++++-----
11 1 files changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/ext/sat_xfopen.c b/ext/sat_xfopen.c
14index cf943cf..b3d458d 100644
15--- a/ext/sat_xfopen.c
16+++ b/ext/sat_xfopen.c
17@@ -16,16 +16,16 @@
18
19 static ssize_t cookie_gzread(void *cookie, char *buf, size_t nbytes)
20 {
21- return gzread((gzFile *)cookie, buf, nbytes);
22+ return gzread((gzFile)cookie, buf, nbytes);
23 }
24
25 static int
26 cookie_gzclose(void *cookie)
27 {
28- return gzclose((gzFile *)cookie);
29+ return gzclose((gzFile)cookie);
30 }
31
32-static FILE *mygzfopen(gzFile* gzf)
33+static FILE *mygzfopen(gzFile gzf)
34 {
35 #ifdef HAVE_FUNOPEN
36 return funopen(
37@@ -49,7 +49,7 @@ FILE *
38 sat_xfopen(const char *fn, const char *mode)
39 {
40 char *suf;
41- gzFile *gzf;
42+ gzFile gzf;
43
44 if (!fn)
45 return 0;
46@@ -68,7 +68,7 @@ FILE *
47 sat_xfopen_fd(const char *fn, int fd, const char *mode)
48 {
49 char *suf;
50- gzFile *gzf;
51+ gzFile gzf;
52
53 suf = fn ? strrchr(fn, '.') : 0;
54 if (!mode)
55--
561.7.5.4
57
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index e243c6add8..9d8422fef4 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db"
8 8
9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" 9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
10PV = "0.0-git${SRCPV}" 10PV = "0.0-git${SRCPV}"
11PR = "r12" 11PR = "r13"
12 12
13PARALLEL_MAKE="" 13PARALLEL_MAKE=""
14 14
@@ -19,6 +19,7 @@ SRC_URI = "git://github.com/openSUSE/sat-solver.git;protocol=git \
19 file://db5.patch \ 19 file://db5.patch \
20 file://sat-solver_core.patch \ 20 file://sat-solver_core.patch \
21 file://fix_gcc-4.6.0_compile_issue.patch \ 21 file://fix_gcc-4.6.0_compile_issue.patch \
22 file://0001-sat_xfopen.c-Forward-port-to-zlib-1.2.6-gzFile.patch \
22 " 23 "
23 24
24S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"