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

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build/jam/ImageRules
View File

@ -1136,24 +1136,13 @@ rule AddLibrariesToHaikuHybridImage directory : libs
local lib ;
for lib in $(libs) {
local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ;
if $(abiMajor) {
local abiMajorLib = $(lib).$(abiMajor) ;
local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ;
if $(abiMinor) {
local abiMinorLib = $(abiMajorLib).$(abiMinor) ;
AddFilesToHaikuHybridImage $(directory)
: $(lib) : $(abiMinorLib) : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMinorLib) : $(abiMajorLib) : : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMinorLib) : $(lib) : : true ;
} else {
AddFilesToHaikuHybridImage $(directory)
: $(lib) : $(abiMajorLib) : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMajorLib) : $(lib) : : true ;
}
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) {
local abiVersionedLib = $(lib).$(abiVersion) ;
AddFilesToHaikuHybridImage $(directory)
: $(lib) : $(abiVersionedLib) : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiVersionedLib) : $(lib) : : true ;
} else {
AddFilesToHaikuHybridImage $(directory) : $(lib) : : true ;
}

14
build/jam/MainBuildRules
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) ;

14
build/jam/OptionalPackages
View File

@ -403,17 +403,11 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) {
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(lib:BS) : : true ;
local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ;
local abiMajorLib = $(lib:BS).$(abiMajor) ;
if $(abiMajor) {
local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ;
if $(abiMinor) {
local abiMinorLib = $(abiMinorLib).$(abiMinor) ;
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(abiMinorLib) : : true ;
}
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) {
local abiVersionedLib = $(lib:BS).$(abiVersion) ;
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(abiMajorLib) : : true ;
: /system/lib $(abiVersionedLib) : : true ;
}
}

2
src/libs/png/Jamfile
View File

@ -27,6 +27,6 @@ local shared_files =
Objects $(shared_files) ;
SharedLibrary libpng.so : [ FGristFiles $(shared_files:S=.o) ] : z : 1.2 : ;
SharedLibrary libpng.so : [ FGristFiles $(shared_files:S=.o) ] : z : 1.2 ;
StaticLibrary libpng.a : [ FGristFiles $(shared_files:S=.o) ] ;

2
src/libs/zlib/Jamfile
View File

@ -21,7 +21,7 @@ local shared_files =
Objects $(shared_files) ;
SharedLibrary libz.so : [ FGristFiles $(shared_files:S=.o) ] : : 1 : 2 ;
SharedLibrary libz.so : [ FGristFiles $(shared_files:S=.o) ] : : 1 ;
StaticLibrary libz.a : [ FGristFiles $(shared_files:S=.o) ] ;