From d9e5bb0df70f0773fc8d4b88e55c8e35c92b5c1d Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Fri, 16 Nov 2012 03:01:19 +0100 Subject: [PATCH] ARM/ICU: add "optional" packages for ICU on ARM --- build/jam/OptionalBuildFeatures | 7 +++++-- build/jam/OptionalPackages | 10 +++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index ca0097acf9..dd4ea9aca2 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -69,12 +69,15 @@ if $(HAIKU_BUILD_FEATURE_SSL) { HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc2-2012-08-29.zip ; HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1.1-r1a4-x86-gcc4-2012-08-29.zip ; HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ; - -if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { +HAIKU_ICU_ARM_PACKAGE = icu-4.8.1.1-arm-2012-11-16.zip ; +if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = arm { local icu_package ; if $(TARGET_ARCH) = ppc { icu_package = $(HAIKU_ICU_PPC_PACKAGE) ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-ppc-2011-12-19.zip ; + } else if $(TARGET_ARCH) = arm { + icu_package = $(HAIKU_ICU_ARM_PACKAGE) ; + HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-arm-2012-11-16.zip ; } else if $(HAIKU_GCC_VERSION[1]) = 2 { icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-x86-gcc2-2011-12-20.zip ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 3875fc71df..710dba74a7 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1100,9 +1100,7 @@ if [ IsOptionalHaikuImagePackageAdded HGrep ] { # ICU if [ IsOptionalHaikuImagePackageAdded ICU ] { - if $(TARGET_ARCH) != x86 { - Echo "No optional package ICU available for $(TARGET_ARCH)" ; - } else { + if $(TARGET_ARCH) = x86 { if $(HAIKU_GCC_VERSION[1]) = 2 { # unzip gcc2 InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE) @@ -1126,6 +1124,12 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] { : system lib gcc2 ; } } + } else if $(TARGET_ARCH) = arm { + InstallOptionalHaikuImagePackage $(HAIKU_ICU_ARM_PACKAGE) + : $(baseURL)/(HAIKU_ICU_ARM_PACKAGE) + : system lib ; + } else { + Echo "No optional package ICU available for $(TARGET_ARCH)" ; } }