[haiku-commits] r35730 - haiku/trunk/build/jam

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 2 Mar 2010 23:30:40 +0100 (CET)

Author: zooey
Date: 2010-03-02 23:30:40 +0100 (Tue, 02 Mar 2010)
New Revision: 35730
Changeset: http://dev.haiku-os.org/changeset/35730/haiku
Ticket: http://dev.haiku-os.org/ticket/5499

Modified:
   haiku/trunk/build/jam/OptionalPackageDependencies
   haiku/trunk/build/jam/OptionalPackages
Log:
Fix #5499 for real:
* the optional package ICU-devel now explicitly installs the appropriate
  symlinks for the development libraries as required (for both standard
  and hybrid builds)
* ICU-devel now depends on Development (more indicative than required, but
  I think it makes sense)
Thanks to Matt and Rene for pointing me in the right direction.


Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies   2010-03-02 22:27:14 UTC 
(rev 35729)
+++ haiku/trunk/build/jam/OptionalPackageDependencies   2010-03-02 22:30:40 UTC 
(rev 35730)
@@ -9,6 +9,7 @@
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
+OptionalPackageDependencies ICU-devel : Development ;
 OptionalPackageDependencies Firefox : BeZillaBrowser ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-03-02 22:27:14 UTC (rev 
35729)
+++ haiku/trunk/build/jam/OptionalPackages      2010-03-02 22:30:40 UTC (rev 
35730)
@@ -567,6 +567,20 @@
        InstallOptionalHaikuImagePackage icu-devel-4.2-2010-01-26.zip
                : $(baseURL)/icu-devel-4.2-2010-01-26.zip
        ;
+       local arch = $(TARGET_ARCH) ;
+       local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
+       local libs = common data i18n ;
+       for lib in $(libs) {
+               lib = libicu-$(lib).so ;
+               local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) 
] ;
+               if $(abiVersion) {
+                       local abiVersionedLib = $(lib).$(abiVersion) ;
+                       AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) 
lib
+                               : /system/lib $(abiVersionedLib) : : true ;
+               }
+               AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
+                       : /system/lib $(lib) : : true ;
+       }
 }
 
 
@@ -823,9 +837,9 @@
                                :
                        ;
                }
-               AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z 
-                       : "7za l \\0045s" 
-                       : "7za x -y \\0045s" 
+               AddExpanderRuleToHaikuImage "application/x-7z-compressed" : .7z
+                       : "7za l \\0045s"
+                       : "7za x -y \\0045s"
                ;
 
        }


Other related posts: