From bb6b6a1504f8a48a203ffe9ece56256044247d42 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Tue, 20 Dec 2011 21:59:33 +0100
Subject: [PATCH] Correct explicitly created symlinks for ICU-devel package

* skip the right amount of extensions until the actual abi version
  is reached
---
 build/jam/OptionalPackages | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index d731045dc3..b3a4fbcf8a 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -938,9 +938,14 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
 
 	local arch = $(TARGET_ARCH) ;
 	local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
+	local lib ;
 	for abiVersionedLib in $(HAIKU_ICU_LIBS) {
 		abiVersionedLib = $(abiVersionedLib:B:G=) ;
-		local lib = $(abiVersionedLib:B) ;
+		lib = $(abiVersionedLib:B) ;
+		while $(lib:S) != ".so" {
+			abiVersionedLib = $(abiVersionedLib:B) ;
+			lib = $(abiVersionedLib:B) ;
+		}
 		AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
 			: /system/lib $(abiVersionedLib) : : true ;
 		AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib