diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-07-24 15:13:16 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-07-24 15:13:16 +0000 |
| commit | a7008234e6dfc3d7543fe65865a7a05a94ecb72b (patch) | |
| tree | 1512f75dd17bae65562b726420fa993950bf2662 /dev-libs/icu | |
| parent | arm stable, bug #324691 (diff) | |
| download | gentoo-2-a7008234e6dfc3d7543fe65865a7a05a94ecb72b.tar.gz gentoo-2-a7008234e6dfc3d7543fe65865a7a05a94ecb72b.tar.bz2 gentoo-2-a7008234e6dfc3d7543fe65865a7a05a94ecb72b.zip | |
Fix building on arm (bug #329439).
(Portage version: HEAD/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.1-arm.patch | 26 | ||||
| -rw-r--r-- | dev-libs/icu/icu-4.4.1.ebuild | 3 |
3 files changed, 33 insertions, 2 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index 03602c9afcdf..99a87fbe364c 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.114 2010/07/02 22:45:03 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.115 2010/07/24 15:13:16 arfrever Exp $ + + 24 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + icu-4.4.1.ebuild, +files/icu-4.4.1-arm.patch: + Fix building on arm (bug #329439). 02 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> icu-4.4.1.ebuild, +files/icu-4.4.1-et_EE.patch: diff --git a/dev-libs/icu/files/icu-4.4.1-arm.patch b/dev-libs/icu/files/icu-4.4.1-arm.patch new file mode 100644 index 000000000000..20f4852ea624 --- /dev/null +++ b/dev-libs/icu/files/icu-4.4.1-arm.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/show_bug.cgi?id=329439 +https://bugs.icu-project.org/trac/ticket/7664 +https://bugs.icu-project.org/trac/changeset/28107 + +--- tools/toolutil/pkg_genc.c ++++ tools/toolutil/pkg_genc.c +@@ -1,5 +1,5 @@ + /****************************************************************************** +- * Copyright (C) 2009, International Business Machines ++ * Copyright (C) 2009-2010, International Business Machines + * Corporation and others. All Rights Reserved. + ******************************************************************************* + */ +@@ -118,10 +118,10 @@ + } assemblyHeader[] = { + {"gcc", + ".globl %s\n" +- "\t.section .note.GNU-stack,\"\",@progbits\n" ++ "\t.section .note.GNU-stack,\"\",%%progbits\n" + "\t.section .rodata\n" + "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */ +- "\t.type %s,@object\n" ++ "\t.type %s,%%object\n" + "%s:\n\n", + + ".long ","",HEX_0X diff --git a/dev-libs/icu/icu-4.4.1.ebuild b/dev-libs/icu/icu-4.4.1.ebuild index 6428b95c7ebd..645333c2cb83 100644 --- a/dev-libs/icu/icu-4.4.1.ebuild +++ b/dev-libs/icu/icu-4.4.1.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.1.ebuild,v 1.8 2010/07/02 22:45:03 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.4.1.ebuild,v 1.9 2010/07/24 15:13:16 arfrever Exp $ EAPI="3" @@ -52,6 +52,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-pkgdata.patch" epatch "${FILESDIR}/${P}-et_EE.patch" + epatch "${FILESDIR}/${P}-arm.patch" } src_configure() { |