diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2012-06-07 16:43:17 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-06-07 16:43:17 +0000 |
| commit | b40441e010f295715ef928b4892129c0f02f08bf (patch) | |
| tree | 0529be79b85026b92480b72f7098c51148beb6a4 /dev-libs/beecrypt | |
| parent | Stable for x86, wrt bug #418649 (diff) | |
| download | gentoo-2-b40441e010f295715ef928b4892129c0f02f08bf.tar.gz gentoo-2-b40441e010f295715ef928b4892129c0f02f08bf.tar.bz2 gentoo-2-b40441e010f295715ef928b4892129c0f02f08bf.zip | |
Fix build with GCC 4.7 wrt bug #413951. Thanks to Olivier Huber <oli.huber@gmail.com> for the patch.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/beecrypt')
| -rw-r--r-- | dev-libs/beecrypt/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/beecrypt/beecrypt-4.2.1.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch | 11 |
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog index 8c8b9c513523..7de90b2d29aa 100644 --- a/dev-libs/beecrypt/ChangeLog +++ b/dev-libs/beecrypt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/beecrypt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.81 2012/03/03 12:09:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.82 2012/06/07 16:43:17 kensington Exp $ + + 07 Jun 2012; Michael Palimaka <kensington@gentoo.org> + +files/beecrypt-4.2.1-gcc-4.7.patch, beecrypt-4.2.1.ebuild: + Fix build with GCC 4.7 wrt bug #413951. Thanks to Olivier Huber + <oli.huber@gmail.com> for the patch. 03 Mar 2012; Pacho Ramos <pacho@gentoo.org> beecrypt-4.2.1.ebuild: Run java-pkg-opt-2_pkg_setup to use jdk when compiling, bug #401803 by DrSlony diff --git a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild index ed25f986dfda..e153d5c47dfa 100644 --- a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild +++ b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.17 2012/03/03 12:09:31 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.18 2012/06/07 16:43:17 kensington Exp $ EAPI=4 PYTHON_DEPEND="python? 2" @@ -46,6 +46,7 @@ src_prepare() { use python && python_convert_shebangs -r 2 . epatch "${FILESDIR}"/${P}-build-system.patch + epatch "${FILESDIR}"/${P}-gcc-4.7.patch eautoreconf } diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch new file mode 100644 index 000000000000..64d513bde63f --- /dev/null +++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-gcc-4.7.patch @@ -0,0 +1,11 @@ +--- include/beecrypt/c++/util/AbstractSet.h ++++ include/beecrypt/c++/util/AbstractSet.h +@@ -56,7 +56,7 @@ + if (c->size() != size()) + return false; + +- return containsAll(*c); ++ return this->containsAll(*c); + } + return false; + } |