diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2008-05-02 07:34:42 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2008-05-02 07:34:42 +0000 |
| commit | ab6df2f8ccd98cd3a5bb2b8f3ca4f638b4e41fc2 (patch) | |
| tree | 43207ceec8a6d487f1c5191a10d64757854a4df1 /dev-libs/botan | |
| parent | dev-cpp/libgnomeuimm: Up the dep on libgnomecanvasmm (fixes bug #215769) (diff) | |
| download | gentoo-2-ab6df2f8ccd98cd3a5bb2b8f3ca4f638b4e41fc2.tar.gz gentoo-2-ab6df2f8ccd98cd3a5bb2b8f3ca4f638b4e41fc2.tar.bz2 gentoo-2-ab6df2f8ccd98cd3a5bb2b8f3ca4f638b4e41fc2.zip | |
Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix g++ CHOST usage
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'dev-libs/botan')
| -rw-r--r-- | dev-libs/botan/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/botan/botan-1.6.1-r1.ebuild | 15 | ||||
| -rw-r--r-- | dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch | 19 |
3 files changed, 35 insertions, 8 deletions
diff --git a/dev-libs/botan/ChangeLog b/dev-libs/botan/ChangeLog index cdaeef5497e0..63cd98ee94ef 100644 --- a/dev-libs/botan/ChangeLog +++ b/dev-libs/botan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/botan -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.30 2007/11/11 05:40:38 alonbl Exp $ +# 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 $ + + 02 May 2008; Alon Bar-Lev <alonbl@gentoo.org> + +files/botan-1.6.1-gcc-4.2.patch, botan-1.6.1-r1.ebuild: + Fix bug#219896, thanks to Nickolay Kolchin-Semyonov and Jack Lloyd, also fix + g++ CHOST usage 11 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -botan-1.6.1.ebuild: Cleanup diff --git a/dev-libs/botan/botan-1.6.1-r1.ebuild b/dev-libs/botan/botan-1.6.1-r1.ebuild index 45167c62ffbd..256935365bff 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-2007 Gentoo Foundation +# 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.4 2007/11/11 04:12:38 cla Exp $ +# $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 $ inherit eutils multilib @@ -31,6 +31,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-asm.patch" + epatch "${FILESDIR}/${P}-gcc-4.2.patch" } src_compile() { @@ -73,11 +74,13 @@ src_compile() { # FIXME: We might actually be on *BSD or OS X... ./configure.pl \ - --noauto gcc-linux-${CHOSTARCH} \ + --noauto \ --libdir=/$(get_libdir) \ - --modules=$modules || - die "configure.pl failed" - emake "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed" + --modules=$modules \ + gcc-linux-${CHOSTARCH} || + die "configure.pl failed" + emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" \ + "LIB_OPT=${CXXFLAGS}" "MACH_OPT=" || die "emake failed" } src_test() { 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 new file mode 100644 index 000000000000..8a4f999f717f --- /dev/null +++ b/dev-libs/botan/files/botan-1.6.1-gcc-4.2.patch @@ -0,0 +1,19 @@ +# +# old_revision [98e326ec23e729a704878ea5174472e0b4d8f2a1] +# +# patch "configure.pl" +# from [a32942b1c853313df9bd9014344f61952bc45279] +# to [ac4bc30d588510c3702b07b97f07ab2fd29d93d8] +# +============================================================ +--- configure.pl a32942b1c853313df9bd9014344f61952bc45279 ++++ configure.pl ac4bc30d588510c3702b07b97f07ab2fd29d93d8 +@@ -334,7 +334,7 @@ sub choose_target { + # buggy GCC. There is no reduction in code quality so even + # 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]/) || + ($gcc_version =~ /2\.95\.[0-4]/) || + ($gcc_version eq '' && $^O eq 'cygwin')) + { |