i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM/ICU: add "optional" packages for ICU on ARM

Browse Source
This commit is contained in:
Ithamar R. Adema
2012-11-16 03:04:27 +01:00
parent 63fe8ecdd9
commit d9e5bb0df7
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+5 -2
View File
@@ -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_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_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 ; HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ;
HAIKU_ICU_ARM_PACKAGE = icu-4.8.1.1-arm-2012-11-16.zip ;
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = arm {
local icu_package ; local icu_package ;
if $(TARGET_ARCH) = ppc { if $(TARGET_ARCH) = ppc {
icu_package = $(HAIKU_ICU_PPC_PACKAGE) ; icu_package = $(HAIKU_ICU_PPC_PACKAGE) ;
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-ppc-2011-12-19.zip ; 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 { } else if $(HAIKU_GCC_VERSION[1]) = 2 {
icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ; icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ;
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-x86-gcc2-2011-12-20.zip ; HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1.1-x86-gcc2-2011-12-20.zip ;
build/jam/OptionalPackages
+7 -3
View File
@@ -1100,9 +1100,7 @@ if [ IsOptionalHaikuImagePackageAdded HGrep ] {
# ICU # ICU
if [ IsOptionalHaikuImagePackageAdded ICU ] { if [ IsOptionalHaikuImagePackageAdded ICU ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) = x86 {
Echo "No optional package ICU available for $(TARGET_ARCH)" ;
} else {
if $(HAIKU_GCC_VERSION[1]) = 2 { if $(HAIKU_GCC_VERSION[1]) = 2 {
# unzip gcc2 # unzip gcc2
InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE) InstallOptionalHaikuImagePackage $(HAIKU_ICU_GCC_2_PACKAGE)
@@ -1126,6 +1124,12 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
: system lib gcc2 ; : 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)" ;
} }
} }