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

Update ICU to 4.4

Browse Source 
* Remove 4.2 sourcecode
 * ICU is now an optional package (mandatory)
 * Adjust the namespaces and libraries names where needed


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37498 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-07-13 19:04:40 +00:00
parent 546fac2d14
commit 5098ba1b94
3232 changed files with 9773 additions and 2011716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
-3
View File
@@ -77,8 +77,6 @@ SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku
;
ICU_LIBS = libicu-common.so libicu-data.so libicu-i18n.so
;
SYSTEM_LIBS =
libbe.so libbsd.so libbnetapi.so
libdebug.so libdevice.so
@@ -100,7 +98,6 @@ PRIVATE_SYSTEM_LIBS =
libfluidsynth.so
libilmimf.so
liblinprog.so liblpsolve55.so
$(ICU_LIBS)
;
SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
media_addon_server media_server midi_server mount_server net_server
build/jam/OptionalBuildFeatures
+47
View File
@@ -45,3 +45,50 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
= [ FDirName $(HAIKU_OPENSSL_DIR) common include ] ;
}
}
# ICU
# Note ICU isn't actually optional, but is still an external package
local isHybridBuild ;
if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
&& $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
isHybridBuild = 1 ;
}
if $(HAIKU_GCC_VERSION[1]) < 4 && !isHybridBuild) {
HAIKU_ICU_PACKAGE = icu-4.4.1-r1a2-x86-gcc2-2010-07-13-a.zip ;
} else {
HAIKU_ICU_PACKAGE = icu-4.4.1-r1a2-x86-gcc4-2010-07-13-a.zip ;
}
HAIKU_ICU_URL = $(baseURL)/$(HAIKU_ICU_PACKAGE) ;
if $(TARGET_ARCH) != x86 {
Echo "ICU not available for $(TARGET_ARCH)" ;
} else {
local zipFile = [ DownloadFile $(HAIKU_ICU_PACKAGE) : $(HAIKU_ICU_URL) ] ;
# zip file and output directory
HAIKU_ICU_ZIP_FILE = $(zipFile) ;
HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_ICU_PACKAGE:B) ] ;
# extract headers and libraries
# HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DIR)
# : common/include/ : $(zipFile) ] ;
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
:
system/lib/libicudata.so
system/lib/libicui18n.so
system/lib/libicuio.so
system/lib/libicule.so
system/lib/libiculx.so
system/lib/libicutu.so
system/lib/libicuuc.so
: $(zipFile)
] ;
HAIKU_ICU_HEADERS
= [ FDirName $(HAIKU_ICU_DIR) common include ] ;
}