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/ImageRules
+7 -18
View File
@@ -1136,24 +1136,13 @@ rule AddLibrariesToHaikuHybridImage directory : libs
local lib ; local lib ;
for lib in $(libs) { for lib in $(libs) {
local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiMajor) { if $(abiVersion) {
local abiMajorLib = $(lib).$(abiMajor) ; local abiVersionedLib = $(lib).$(abiVersion) ;
local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ; AddFilesToHaikuHybridImage $(directory)
if $(abiMinor) { : $(lib) : $(abiVersionedLib) : true ;
local abiMinorLib = $(abiMajorLib).$(abiMinor) ; AddSymlinkToHaikuHybridImage $(directory)
AddFilesToHaikuHybridImage $(directory) : $(abiVersionedLib) : $(lib) : : true ;
: $(lib) : $(abiMinorLib) : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMinorLib) : $(abiMajorLib) : : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMinorLib) : $(lib) : : true ;
} else {
AddFilesToHaikuHybridImage $(directory)
: $(lib) : $(abiMajorLib) : true ;
AddSymlinkToHaikuHybridImage $(directory)
: $(abiMajorLib) : $(lib) : : true ;
}
} else { } else {
AddFilesToHaikuHybridImage $(directory) : $(lib) : : true ; AddFilesToHaikuHybridImage $(directory) : $(lib) : : true ;
} }
build/jam/MainBuildRules
+5 -9
View File
@@ -424,24 +424,20 @@ rule SharedLibraryFromObjects
rule SharedLibrary rule SharedLibrary
{ {
# SharedLibrary <lib> : <sources> : <libraries> : <abiMajor> : <abiMinor>; # SharedLibrary <lib> : <sources> : <libraries> : <abiVersion> ;
local lib = $(1) ; local lib = $(1) ;
local sources = [ FGristFiles $(2) ] ; local sources = [ FGristFiles $(2) ] ;
local objects = $(sources:S=$(SUFOBJ)) ; local objects = $(sources:S=$(SUFOBJ)) ;
local libs = $(3) ; local libs = $(3) ;
local abiMajor = $(4) ; # major ABI (soname) version for lib (if any) local abiVersion = $(4) ; # major ABI (soname) version for lib (if any)
local abiMinor = $(5) ; # additional minor suffix (optional)
if ! [ IsPlatformSupportedForTarget $(1) ] { if ! [ IsPlatformSupportedForTarget $(1) ] {
return ; return ;
} }
if $(abiMajor) { if $(abiVersion) {
HAIKU_SONAME on $(lib) = $(lib:BS).$(abiMajor) ; HAIKU_SONAME on $(lib) = $(lib:BS).$(abiVersion) ;
HAIKU_LIB_ABI_MAJOR on $(lib) = $(abiMajor) ; HAIKU_LIB_ABI_VERSION on $(lib) = $(abiVersion) ;
if $(abiMinor) {
HAIKU_LIB_ABI_MINOR on $(lib) = $(abiMinor) ;
}
} }
InheritPlatform $(objects) : $(lib) ; InheritPlatform $(objects) : $(lib) ;
build/jam/OptionalPackages
+4 -10
View File
@@ -403,17 +403,11 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) { for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) {
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(lib:BS) : : true ; : /system/lib $(lib:BS) : : true ;
local abiMajor = [ on $(lib) return $(HAIKU_LIB_ABI_MAJOR) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
local abiMajorLib = $(lib:BS).$(abiMajor) ; if $(abiVersion) {
if $(abiMajor) { local abiVersionedLib = $(lib:BS).$(abiVersion) ;
local abiMinor = [ on $(lib) return $(HAIKU_LIB_ABI_MINOR) ] ;
if $(abiMinor) {
local abiMinorLib = $(abiMinorLib).$(abiMinor) ;
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(abiMinorLib) : : true ;
}
AddSymlinkToHaikuHybridImage $(abiDirTokens) lib AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
: /system/lib $(abiMajorLib) : : true ; : /system/lib $(abiVersionedLib) : : true ;
} }
} }
src/libs/png/Jamfile
+1 -1
View File
@@ -27,6 +27,6 @@ local shared_files =
Objects $(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) ] ; StaticLibrary libpng.a : [ FGristFiles $(shared_files:S=.o) ] ;
src/libs/zlib/Jamfile
+1 -1
View File
@@ -21,7 +21,7 @@ local shared_files =
Objects $(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) ] ; StaticLibrary libz.a : [ FGristFiles $(shared_files:S=.o) ] ;