From 00912ff31761a083a08db13f3b8d072b8e81dc05 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 26 Aug 2011 19:28:39 +0000 Subject: [PATCH] * 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 --- build/jam/OptionalBuildFeatures | 2 +- build/jam/OptionalPackages | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 8692a97bc2..b12bbd1999 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -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 ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index c14550b84f..2be931295f 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -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 ;