diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-24 02:14:40 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-24 02:14:40 +0000 |
| commit | a9af232474af26f5226b409093b4a50892615cfe (patch) | |
| tree | 0d71a22658a75b4bddfefd16dbd4ce18b1953b38 | |
| parent | Revbump with patch from bug #273697 (diff) | |
| download | gentoo-2-a9af232474af26f5226b409093b4a50892615cfe.tar.gz gentoo-2-a9af232474af26f5226b409093b4a50892615cfe.tar.bz2 gentoo-2-a9af232474af26f5226b409093b4a50892615cfe.zip | |
Fix building on arm, hppa, ia64, s390, sh and sparc (bug #275769).
(Portage version: 14708-svn/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/icu/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/icu/files/icu-4.2.1-pkgdata-build_data_without_assembly.patch | 16 | ||||
| -rw-r--r-- | dev-libs/icu/icu-4.2.1.ebuild | 5 |
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index dd9706a4fe13..89bb20c8f6c1 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/icu # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.98 2009/08/31 17:22:51 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.99 2009/10/24 02:14:39 arfrever Exp $ + + 24 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + icu-4.2.1.ebuild, + +files/icu-4.2.1-pkgdata-build_data_without_assembly.patch: + Fix building on arm, hppa, ia64, s390, sh and sparc (bug #275769). 31 Aug 2009; Brent Baude <ranger@gentoo.org> icu-4.2.1.ebuild: Marking icu-4.2.1 ppc64 for bug 281267 diff --git a/dev-libs/icu/files/icu-4.2.1-pkgdata-build_data_without_assembly.patch b/dev-libs/icu/files/icu-4.2.1-pkgdata-build_data_without_assembly.patch new file mode 100644 index 000000000000..9edab456dd66 --- /dev/null +++ b/dev-libs/icu/files/icu-4.2.1-pkgdata-build_data_without_assembly.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/show_bug.cgi?id=275769 + +--- tools/pkgdata/pkgdata.cpp ++++ tools/pkgdata/pkgdata.cpp +@@ -77,6 +77,11 @@ + #define CAN_WRITE_OBJ_CODE + #endif + ++#ifdef CAN_WRITE_OBJ_CODE ++#undef CAN_WRITE_OBJ_CODE ++#define BUILD_DATA_WITHOUT_ASSEMBLY ++#endif ++ + /* + * When building the data library without assembly, + * some platforms use a single c code file for all of diff --git a/dev-libs/icu/icu-4.2.1.ebuild b/dev-libs/icu/icu-4.2.1.ebuild index bb33d2b11818..7a15810b2860 100644 --- a/dev-libs/icu/icu-4.2.1.ebuild +++ b/dev-libs/icu/icu-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.2.1.ebuild,v 1.7 2009/08/31 17:22:51 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-4.2.1.ebuild,v 1.8 2009/10/24 02:14:39 arfrever Exp $ EAPI="2" @@ -47,8 +47,9 @@ src_prepare() { sed -i -e "/^${x} =.*/s:@${x}@::" "config/Makefile.inc.in" || die "sed failed" done - epatch "${FILESDIR}/${P}-pkgdata.patch" epatch "${FILESDIR}/${P}-fix_misoptimizations.patch" + epatch "${FILESDIR}/${P}-pkgdata.patch" + epatch "${FILESDIR}/${P}-pkgdata-build_data_without_assembly.patch" } src_configure() { |