diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-11-02 07:11:20 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-11-02 07:11:20 +0000 |
| commit | 13f5eecde7819443da3b2a049365ecdf200c5caa (patch) | |
| tree | c93abc36118f3699e06fbf64efb72eb7e923c28c /dev-libs/icu | |
| parent | Fix ebuild for Prefix, bug #343777 (diff) | |
| download | gentoo-2-13f5eecde7819443da3b2a049365ecdf200c5caa.tar.gz gentoo-2-13f5eecde7819443da3b2a049365ecdf200c5caa.tar.bz2 gentoo-2-13f5eecde7819443da3b2a049365ecdf200c5caa.zip | |
Fix tests with GCC 4.5 (bugs #318393, #339844).
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/icu')
| -rw-r--r-- | dev-libs/icu/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch | 32 | ||||
| -rw-r--r-- | dev-libs/icu/icu-4.4.2.ebuild | 3 |
3 files changed, 39 insertions, 2 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index 97b3b274b9c4..a0db11686194 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/icu # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.122 2010/10/02 22:31:41 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.123 2010/11/02 07:11:20 arfrever Exp $ + + 02 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + icu-4.4.2.ebuild, +files/icu-4.4.2-gcc-4.5.patch: + Fix tests with GCC 4.5 (bugs #318393, #339844). *icu-4.4.2 (02 Oct 2010) diff --git a/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch b/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch new file mode 100644 index 000000000000..0b5d2ebdd2d5 --- /dev/null +++ b/dev-libs/icu/files/icu-4.4.2-gcc-4.5.patch @@ -0,0 +1,32 @@ +https://ssl.icu-project.org/trac/ticket/7932 +https://ssl.icu-project.org/trac/changeset/28667 +https://ssl.icu-project.org/trac/ticket/8011 +https://ssl.icu-project.org/trac/changeset/28772 + +--- test/cintltst/cnumtst.c ++++ test/cintltst/cnumtst.c +@@ -405,7 +405,12 @@ + log_err("parse failed. The error is : %s\n", myErrorName(status)); + } + +- if(d1!=462.12345) ++ /* ++ * Note: "for strict standard conformance all operations and constants are now supposed to be evaluated in precision of long double". So, we assign a1 before comparing to a double. Bug #7932. ++ */ ++ a1 = 462.12345; ++ ++ if(d1!=a1) + log_err("Fail: Error in parsing\n"); + else + log_verbose("Pass: parsing successful\n"); +--- test/intltest/numfmtst.cpp ++++ test/intltest/numfmtst.cpp +@@ -6144,7 +6144,7 @@ + ) + { + errln("ERROR: parse failed - expected 123.0, 3 - returned %d, %i", +- result.getDouble(), parsePos); ++ result.getDouble(), parsePos.getIndex()); + } + } + diff --git a/dev-libs/icu/icu-4.4.2.ebuild b/dev-libs/icu/icu-4.4.2.ebuild index 18c453d1c706..8572b6c68dd9 100644 --- a/dev-libs/icu/icu-4.4.2.ebuild +++ b/dev-libs/icu/icu-4.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.4.2.ebuild,v 1.1 2010/10/02 22:31:41 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.4.2.ebuild,v 1.2 2010/11/02 07:11:20 arfrever Exp $ EAPI="3" @@ -53,6 +53,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-4.4.1-pkgdata.patch" epatch "${FILESDIR}/${PN}-4.4.1-et_EE.patch" epatch "${FILESDIR}/${PN}-4.4.1-arm.patch" + epatch "${FILESDIR}/${P}-gcc-4.5.patch" } src_configure() { |