i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* reverted the part of r35362 that introduced support for minor ABI versioning - my evil twin made

Browse Source 
me do that!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35370 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-01-31 23:41:44 +00:00
parent ef9c0b6a51
commit 783930d916
5 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+5 -9
View File
@@ -424,24 +424,20 @@ rule SharedLibraryFromObjects
rule SharedLibrary
{
# SharedLibrary <lib> : <sources> : <libraries> : <abiMajor> : <abiMinor>;
# SharedLibrary <lib> : <sources> : <libraries> : <abiVersion> ;
local lib = $(1) ;
local sources = [ FGristFiles $(2) ] ;
local objects = $(sources:S=$(SUFOBJ)) ;
local libs = $(3) ;
local abiMajor = $(4) ; # major ABI (soname) version for lib (if any)
local abiMinor = $(5) ; # additional minor suffix (optional)
local abiVersion = $(4) ; # major ABI (soname) version for lib (if any)
if ! [ IsPlatformSupportedForTarget $(1) ] {
return ;
}
if $(abiMajor) {
HAIKU_SONAME on $(lib) = $(lib:BS).$(abiMajor) ;
HAIKU_LIB_ABI_MAJOR on $(lib) = $(abiMajor) ;
if $(abiMinor) {
HAIKU_LIB_ABI_MINOR on $(lib) = $(abiMinor) ;
}
if $(abiVersion) {
HAIKU_SONAME on $(lib) = $(lib:BS).$(abiVersion) ;
HAIKU_LIB_ABI_VERSION on $(lib) = $(abiVersion) ;
}
InheritPlatform $(objects) : $(lib) ;