Fix #8098 (icu-devel breaking current abi symlink)
* provide separate icu-devel packages for x86/gcc{2,4} and ppc, in order to bypass problems with this package trying to make use of the /boot/develop/abi/current symlink.
This commit is contained in:
parent
94e5ca7e6d
commit
e94fa361f3
@ -59,16 +59,18 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
|
||||
HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-11-02a.zip ;
|
||||
HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ;
|
||||
HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ;
|
||||
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-2011-08-26.zip ;
|
||||
|
||||
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
|
||||
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 $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ;
|
||||
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-x86-gcc2-2011-12-19.zip ;
|
||||
} else {
|
||||
icu_package = $(HAIKU_ICU_GCC_4_PACKAGE) ;
|
||||
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-x86-gcc4-2011-12-19.zip ;
|
||||
}
|
||||
local zipFile = [ DownloadFile $(icu_package)
|
||||
: $(baseURL)/$(icu_package) ] ;
|
||||
|
Loading…
Reference in New Issue
Block a user