* fix ICU-devel optional package to include link-time libraries (as links to the

actual libs in /system/lib)
* adjust installation code for ICU-devel to generate link for the non-versioned
  form (libicu*.so) and one matching the soname (libicu*.so.48)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42691 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2011-08-26 19:28:39 +00:00
parent 26fbe862cf
commit 00912ff317
2 changed files with 2 additions and 2 deletions

View File

@ -59,7 +59,7 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1-x86-gcc2-2011-08-20.zip ;
HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-08-20.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-18.zip ;
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-2011-08-26.zip ;
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 {
local icu_package ;

View File

@ -919,7 +919,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
for abiVersionedLib in $(HAIKU_ICU_LIBS) {
abiVersionedLib = $(abiVersionedLib:G=) ;
abiVersionedLib = $(abiVersionedLib:B:G=) ;
local lib = $(abiVersionedLib:B) ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: /system/lib $(abiVersionedLib) : : true ;