diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2008-06-18 08:14:30 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2008-06-18 08:14:30 +0000 |
| commit | 6a7b7f1f70dac5a6e843a3b1f8755d343d1bcc45 (patch) | |
| tree | 70e3da548aa05cc1ca0e9e36d18e2e5b1e455fe7 /dev-libs/botan | |
| parent | stable x86, bug 227169 (diff) | |
| download | gentoo-2-6a7b7f1f70dac5a6e843a3b1f8755d343d1bcc45.tar.gz gentoo-2-6a7b7f1f70dac5a6e843a3b1f8755d343d1bcc45.tar.bz2 gentoo-2-6a7b7f1f70dac5a6e843a3b1f8755d343d1bcc45.zip | |
patch for gcc-4.3 compatibility thanks to Jack. bug #227535
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/botan/botan-1.6.1-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch | 2 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch | 19 |
4 files changed, 28 insertions, 3 deletions
diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog index 63cd98ee94ef..494c82be2ee3 100644 --- a/dev-libs/botan/ChangeLog +++ b/dev-libs/botan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/botan # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.31 2008/05/02 07:34:41 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.32 2008/06/18 08:14:29 dragonheart Exp $ + + 18 Jun 2008; Daniel Black <dragonheart@gentoo.org> + files/botan-1.6.1-gcc-4.2.patch, +files/botan-1.6.1-gcc-4.3.patch, + botan-1.6.1-r1.ebuild: + patch for gcc-4.3 compatibility thanks to Jack. bug #227535 02 May 2008; Alon Bar-Lev <alonbl@gentoo.org> +files/botan-1.6.1-gcc-4.2.patch, botan-1.6.1-r1.ebuild: diff --git a/dev-libs/botan/botan-1.6.1-r1.ebuild b/dev-libs/botan/botan-1.6.1-r1.ebuild index 256935365bff..2ac5afb30508 100644 --- a/dev-libs/botan/botan-1.6.1-r1.ebuild +++ b/dev-libs/botan/botan-1.6.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.5 2008/05/02 07:34:41 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.6.1-r1.ebuild,v 1.6 2008/06/18 08:14:29 dragonheart Exp $ inherit eutils multilib @@ -32,6 +32,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-asm.patch" epatch "${FILESDIR}/${P}-gcc-4.2.patch" + epatch "${FILESDIR}/${P}-gcc-4.3.patch" } src_compile() { diff --git a/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch index 8a4f999f717f..cdeffbd4e4b4 100644 --- a/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch +++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch @@ -13,7 +13,7 @@ # if we're wrong it's OK. - if(($gcc_version =~ /4\.[01]/) || ($gcc_version =~ /3\.[34]/) || -+ if(($gcc_version =~ /4\.[0123]/) || ($gcc_version =~ /3\.[34]/) || ++ if(($gcc_version =~ /4\.[0123456]/) || ($gcc_version =~ /3\.[34]/) || ($gcc_version =~ /2\.95\.[0-4]/) || ($gcc_version eq '' && $^O eq 'cygwin')) { diff --git a/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch b/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch new file mode 100644 index 000000000000..6352414d5430 --- /dev/null +++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.3.patch @@ -0,0 +1,19 @@ +# +# old_revision [0f5f960e749e55bc7b457b944ec168184353c300] +# +# patch "modules/es_unix/unix_cmd.cpp" +# from [a6f6bcae52c8704373362bde3174cc1688b65702] +# to [9727c050244b2a27760d460a060ed36ebd37b08d] +# +============================================================ +--- modules/es_unix/unix_cmd.cpp +a6f6bcae52c8704373362bde3174cc1688b65702 ++++ modules/es_unix/unix_cmd.cpp +9727c050244b2a27760d460a060ed36ebd37b08d +@@ -16,6 +16,7 @@ + #include <sys/time.h> + #include <sys/types.h> + #include <sys/wait.h> ++#include <stdlib.h> + #include <unistd.h> + #include <signal.h> |