From 480a26bc39af134bfcdadb03d40d049d02f00c31 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 20 Aug 2011 13:56:43 +0000 Subject: [PATCH] Update icu packages again: * update icu packages for x86 in order to incorporate a fix * add updated icu package for ppc, too git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42646 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalBuildFeatures | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index c74bcd3cea..32f1b269fd 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -56,13 +56,11 @@ if $(HAIKU_BUILD_FEATURE_SSL) { # ICU # Note ICU isn't actually optional, but is still an external package -HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-08-18.zip ; -HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-08-18.zip ; +HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-08-20.zip ; +HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-08-20.zip ; +HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-2011-08-18.zip ; -# TODO: this needs to be upgraded before ICU can be used on PPC! -HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ; - if $(TARGET_ARCH) = ppc { local icu_package = $(HAIKU_ICU_PPC_PACKAGE) ; local zipFile = [ DownloadFile $(icu_package) @@ -107,19 +105,12 @@ if $(TARGET_ARCH) = ppc { # extract libraries HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) : - libicudata.so.48 libicudata.so.48.1 - libicui18n.so.48 libicui18n.so.48.1 - libicuio.so.48 libicuio.so.48.1 - libicule.so.48 libicule.so.48.1 - libiculx.so.48 libiculx.so.48.1 - libicutu.so.48 libicutu.so.48.1 - libicuuc.so.48 libicuuc.so.48.1 : $(zipFile) : extracted-icu