summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-05-05 20:24:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-09 14:09:04 +0100
commitf73fe920a12e08bff09ebd990ba81438c7f99c19 (patch)
treee502cce931946b6dcc0ee77056afa7ff7aad0757 /meta
parent22d6a1384929a7a0ba01a7b330200665f96f0e5b (diff)
downloadpoky-f73fe920a12e08bff09ebd990ba81438c7f99c19.tar.gz
sat-solver: fix compilation issue with gcc 4.6.0
(From OE-Core rev: 34725742939ba62def75c4c505c099dde19565fb) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch115
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb5
2 files changed, 119 insertions, 1 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
new file mode 100644
index 0000000000..11c727dd6c
--- /dev/null
+++ b/meta/recipes-extended/sat-solver/sat-solver/fix_gcc-4.6.0_compile_issue.patch
@@ -0,0 +1,115 @@
1Upstream-Status="Pending"
2
3Fix the following compilation issues with gcc 4.6.0
4
5| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c: In function 'startElement':
6| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:278:25: error: variable 'status' set but not used [-Werror=unused-but-set-variable]
7| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_updateinfoxml.c:386:36: error: variable 'src' set but not used [-Werror=unused-but-set-variable]
8| cc1: all warnings being treated as errors
9|
10| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_updateinfoxml.o] Error 1
11| make[2]: *** Waiting for unfinished jobs....
12| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c: In function 'transaction_add_obsoleted':
13| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/src/transaction.c:1933:21: error: variable 'oldcount' set but not used [-Werror=unused-but-set-variable]
14| cc1: all warnings being treated as errors
15|
16| make[2]: *** [src/CMakeFiles/satsolver.dir/transaction.o] Error 1
17| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
18| make[1]: *** [src/CMakeFiles/satsolver.dir/all] Error 2
19| make[1]: *** Waiting for unfinished jobs....
20| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'rpm_byfp':
21| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2406:20: error: variable 'headerend' set but not used [-Werror=unused-but-set-variable]
22| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c: In function 'parsekeydata':
23| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2833:29: error: variable 'scr' set but not used [-Werror=unused-but-set-variable]
24| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2669:7: error: variable 'useridl' set but not used [-Werror=unused-but-set-variable]
25| /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git/ext/repo_rpmdb.c:2667:7: error: variable 'pubkeyl' set but not used [-Werror=unused-but-set-variable]
26| cc1: all warnings being treated as errors
27|
28| make[2]: *** [ext/CMakeFiles/satsolverext.dir/repo_rpmdb.o] Error 1
29| make[2]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
30| make[1]: *** [ext/CMakeFiles/satsolverext.dir/all] Error 2
31| make[1]: Leaving directory `/build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/git'
32| make: *** [all] Error 2
33| FATAL: oe_runmake failed
34| ERROR: Function 'do_compile' failed (see /build_disk/poky_build/build_gcc_4.6.0/tmp/work/qemux86-poky-linux/sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9/temp/log.do_compile.21830 for further information)
35NOTE: package sat-solver-0.0-git1+0a7378d5f482f477a01cf1690d76871ab8bdcc32-r9: task do_compile: Failed
36
37Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/05
38
39Index: git/src/transaction.c
40===================================================================
41--- git.orig/src/transaction.c
42+++ git/src/transaction.c
43@@ -1930,7 +1930,7 @@ transaction_add_obsoleted(Transaction *t
44 Repo *installed = pool->installed;
45 Id p;
46 Solvable *s;
47- int i, j, k, max, oldcount;
48+ int i, j, k, max;
49 Map done;
50 Queue obsq, *steps;
51
52@@ -1945,7 +1945,6 @@ transaction_add_obsoleted(Transaction *t
53 return;
54 /* make room */
55 steps = &trans->steps;
56- oldcount = steps->count;
57 queue_insertn(steps, 0, max);
58
59 /* now add em */
60Index: git/ext/repo_updateinfoxml.c
61===================================================================
62--- git.orig/ext/repo_updateinfoxml.c
63+++ git/ext/repo_updateinfoxml.c
64@@ -275,7 +275,7 @@ startElement(void *userData, const char
65 */
66 case STATE_UPDATE:
67 {
68- const char *from = 0, *status = 0, *type = 0, *version = 0;
69+ const char *from = 0, __attribute__((__unused__)) *status = 0, *type = 0, *version = 0;
70 for (; *atts; atts += 2)
71 {
72 if (!strcmp(*atts, "from"))
73@@ -383,7 +383,7 @@ startElement(void *userData, const char
74 */
75 case STATE_PACKAGE:
76 {
77- const char *arch = 0, *name = 0, *src = 0;
78+ const char *arch = 0, *name = 0, __attribute__((__unused__)) *src = 0;
79 Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */
80 Id n, a = 0;
81 Id rel_id;
82Index: git/ext/repo_rpmdb.c
83===================================================================
84--- git.orig/ext/repo_rpmdb.c
85+++ git/ext/repo_rpmdb.c
86@@ -2403,7 +2403,7 @@ void *
87 rpm_byfp(FILE *fp, const char *name, void **statep)
88 {
89 struct rpm_by_state *state = *statep;
90- int headerstart, headerend;
91+ int headerstart, __attribute__((__unused__))headerend;
92 RpmHead *rpmhead;
93 int sigdsize, sigcnt, l;
94 unsigned char lead[4096];
95@@ -2664,9 +2664,9 @@ parsekeydata(Solvable *s, Repodata *data
96 unsigned char keyid[8];
97 unsigned int kcr = 0, maxex = 0;
98 unsigned char *pubkey = 0;
99- int pubkeyl = 0;
100+ int __attribute__((__unused__)) pubkeyl = 0;
101 unsigned char *userid = 0;
102- int useridl = 0;
103+ int __attribute__((__unused__)) useridl = 0;
104
105 for (; pl; p += l, pl -= l)
106 {
107@@ -2830,7 +2830,7 @@ parsekeydata(Solvable *s, Repodata *data
108 {
109 int j, ql, haveissuer;
110 unsigned char *q;
111- unsigned int ex = 0, scr = 0;
112+ unsigned int ex = 0, __attribute__((__unused__))scr = 0;
113 unsigned char issuer[8];
114
115 // printf("V4 signature packet\n");
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index a174e76085..c608bb7cc2 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -8,7 +8,9 @@ DEPENDS = "libcheck rpm zlib expat db"
8 8
9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" 9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
10PV = "0.0-git${SRCPV}" 10PV = "0.0-git${SRCPV}"
11PR = "r9" 11PR = "r10"
12
13PARALLEL_MAKE=""
12 14
13SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \ 15SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
14 file://sat-solver_rpm5.patch \ 16 file://sat-solver_rpm5.patch \
@@ -16,6 +18,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
16 file://cmake.patch \ 18 file://cmake.patch \
17 file://db5.patch \ 19 file://db5.patch \
18 file://sat-solver_core.patch \ 20 file://sat-solver_core.patch \
21 file://fix_gcc-4.6.0_compile_issue.patch \
19 " 22 "
20 23
21S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"