From 3fa483ccda706526ef52c8fd93180d65a8cdb359 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 2 Nov 2011 16:29:05 +0000 Subject: [PATCH] Fix ICU portion of PPC build until someone gets around to building an updated PPC package for it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43120 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalBuildFeatures | 39 +++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 5292565b60..83f1285dcb 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -79,18 +79,33 @@ if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { $(icu_package:B) ] ; # extract libraries - HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) - : - libicudata.so.48.1.1 - libicui18n.so.48.1.1 - libicuio.so.48.1.1 - libicule.so.48.1.1 - libiculx.so.48.1.1 - libicutu.so.48.1.1 - libicuuc.so.48.1.1 - : $(zipFile) - : extracted-icu - ] ; + if $(TARGET_ARCH) = ppc { + HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) + : + libicudata.so.48.1 + libicui18n.so.48.1 + libicuio.so.48.1 + libicule.so.48.1 + libiculx.so.48.1 + libicutu.so.48.1 + libicuuc.so.48.1 + : $(zipFile) + : extracted-icu + ] ; + } else { + HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) + : + libicudata.so.48.1.1 + libicui18n.so.48.1.1 + libicuio.so.48.1.1 + libicule.so.48.1.1 + libiculx.so.48.1.1 + libicutu.so.48.1.1 + libicuuc.so.48.1.1 + : $(zipFile) + : extracted-icu + ] ; + } } else { Echo "ICU not available for $(TARGET_ARCH)" ; }