Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #5499 for real:

Browse Source 
* 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.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35730 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2010-03-02 22:30:40 +00:00
parent bbaf002932
commit f435abb00a
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/jam/OptionalPackageDependencies
View File

@ -9,6 +9,7 @@ OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
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 ;

20
build/jam/OptionalPackages
View File

@ -567,6 +567,20 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
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 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] {
:
;
}
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"
;
}