Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Actually include ICU 4.4 in the image we build

Browse Source 
Note this doesn't fix everything yet, apparently there is a problem with ICU genereating an invalid opcode exception.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37512 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues 2010-07-14 10:34:06 +00:00
parent b1008df2c2
commit 2a90ce534c
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jamfile
View File

@ -147,6 +147,8 @@ if $(HAIKU_OPENSSL_ENABLED) {
AddOptionalHaikuImagePackages OpenSSL ;
}
AddOptionalHaikuImagePackages ICU ;
# Evaluate optional package dependencies
include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ;

4
build/jam/OptionalBuildFeatures
View File

@ -89,6 +89,6 @@ if $(TARGET_ARCH) != x86 {
: $(zipFile)
] ;
HAIKU_ICU_HEADERS
= [ FDirName $(HAIKU_ICU_DIR) common include ] ;
#HAIKU_ICU_HEADERS
# = [ FDirName $(HAIKU_ICU_DIR) common include ] ;
}

2
build/jam/OptionalPackageDependencies
View File

@ -15,7 +15,7 @@ OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies ICU-devel : Development ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies MandatoryPackages : Sed Tar ;
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies NetFS : UserlandFS ;

15
build/jam/OptionalPackages
View File

@ -749,6 +749,21 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
}
# ICU
if [ IsOptionalHaikuImagePackageAdded ICU ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package ICU available for $(TARGET_ARCH)" ;
} else {
InstallOptionalHaikuImagePackage $(HAIKU_ICU_PACKAGE)
: $(HAIKU_ICU_URL)
:
:
: true
;
}
}
# KeymapSwitcher
if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(TARGET_ARCH) != x86 {