[haiku-commits] r42691 - haiku/trunk/build/jam
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 26 Aug 2011 21:28:40 +0200 (CEST)
Author: zooey
Date: 2011-08-26 21:28:39 +0200 (Fri, 26 Aug 2011)
New Revision: 42691
Changeset: https://dev.haiku-os.org/changeset/42691
Modified:
haiku/trunk/build/jam/OptionalBuildFeatures
haiku/trunk/build/jam/OptionalPackages
Log:
* 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)
Modified: haiku/trunk/build/jam/OptionalBuildFeatures
===================================================================
--- haiku/trunk/build/jam/OptionalBuildFeatures 2011-08-26 10:31:29 UTC (rev
42690)
+++ haiku/trunk/build/jam/OptionalBuildFeatures 2011-08-26 19:28:39 UTC (rev
42691)
@@ -59,7 +59,7 @@
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 ;
Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages 2011-08-26 10:31:29 UTC (rev
42690)
+++ haiku/trunk/build/jam/OptionalPackages 2011-08-26 19:28:39 UTC (rev
42691)
@@ -919,7 +919,7 @@
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 ;
Other related posts:
