diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-12 22:18:29 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-15 15:12:45 +0100 |
commit | 6aabd4755016cd87a39929d3e827b9c4ff5275b8 (patch) | |
tree | c0566163a69ed9954a4d46f89edfaba5f092f0a2 /meta/recipes-support/beecrypt/beecrypt | |
parent | b42744fac32ed3592462ef014327dae9c88072b2 (diff) | |
download | poky-6aabd4755016cd87a39929d3e827b9c4ff5275b8.tar.gz |
beecrypt: add patch for build issue on Fedora 17
../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wa,--noexecstack -c -o Properties.lo Properties.cxx
x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -isystem/intel/poky/builds/f17/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wa,--noexecstack -c Properties.cxx -fPIC -DPIC -o .libs/Properties.o
In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0,
from ../../include/beecrypt/c++/util/Properties.h:36,
from Properties.cxx:25:
../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::util::AbstractSet<E>::equals(const beecrypt::lang::Object*) const [with E = beecrypt::util::Map<beecrypt::lang::Object, beecrypt::lang::Object>::Entry]':
Properties.cxx:228:1: required from here
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent base 'beecrypt::util::AbstractCollection<beecrypt::util::Map<beecrypt::lang::Object, beecrypt::lang::Object>::Entry>' are not found by unqualified lookup
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' instead
../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::util::AbstractSet<E>::equals(const beecrypt::lang::Object*) const [with E = beecrypt::lang::Object]':
Properties.cxx:228:1: required from here
../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent base 'beecrypt::util::AbstractCollection<beecrypt::lang::Object>' are not found by unqualified lookup
../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' instead
[YOCTO #2593]
(From OE-Core rev: 93aa773c4c03c21a70d7d53cf93e43416e17007c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/beecrypt/beecrypt')
-rw-r--r-- | meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch b/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch new file mode 100644 index 0000000000..8144e39be0 --- /dev/null +++ b/meta/recipes-support/beecrypt/beecrypt/fix-for-gcc-4.7.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | |||
2 | gcc-4.7 seems to be stricter about some things, so follow | ||
3 | the suggestion from the error/note information. | ||
4 | |||
5 | ../../x86_64-linux-libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I../.. | ||
6 | x86_64-linux-libtool: compile: g++ -DHAVE_CONFIG_H -I. -I../.. -I../../include -isyst | ||
7 | In file included from ../../include/beecrypt/c++/util/Hashtable.h:42:0, | ||
8 | from ../../include/beecrypt/c++/util/Properties.h:36, | ||
9 | from Properties.cxx:25: | ||
10 | ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti | ||
11 | Properties.cxx:228:1: required from here | ||
12 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl | ||
13 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b | ||
14 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins | ||
15 | ../../include/beecrypt/c++/util/AbstractSet.h: In instantiation of 'bool beecrypt::uti | ||
16 | Properties.cxx:228:1: required from here | ||
17 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not decl | ||
18 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: declarations in dependent b | ||
19 | ../../include/beecrypt/c++/util/AbstractSet.h:59:27: note: use 'this->containsAll' ins | ||
20 | |||
21 | |||
22 | Upstream-Status: Pending | ||
23 | |||
24 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
25 | |||
26 | |||
27 | Index: beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h | ||
28 | =================================================================== | ||
29 | --- beecrypt-4.2.1.orig/include/beecrypt/c++/util/AbstractSet.h | ||
30 | +++ beecrypt-4.2.1/include/beecrypt/c++/util/AbstractSet.h | ||
31 | @@ -56,7 +56,7 @@ namespace beecrypt { | ||
32 | if (c->size() != size()) | ||
33 | return false; | ||
34 | |||
35 | - return containsAll(*c); | ||
36 | + return this->containsAll(*c); | ||
37 | } | ||
38 | return false; | ||
39 | } | ||