From 783930d9166e3e7f14581748c2d393e04c75ef87 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sun, 31 Jan 2010 23:41:44 +0000
Subject: [PATCH] * 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
---
 build/jam/ImageRules       | 25 +++++++------------------
 build/jam/MainBuildRules   | 14 +++++---------
 build/jam/OptionalPackages | 14 ++++----------
 src/libs/png/Jamfile       |  2 +-
 src/libs/zlib/Jamfile      |  2 +-
 5 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index be9fe63e6a..0378e4f0fd 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -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 ;
 		}
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index b3d6546290..e96b74cfb7 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -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) ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 9dfce496cf..22e3f4d156 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -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 ;
 		}
 	}
 
diff --git a/src/libs/png/Jamfile b/src/libs/png/Jamfile
index 397456f1ab..77eaaa3494 100644
--- a/src/libs/png/Jamfile
+++ b/src/libs/png/Jamfile
@@ -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) ] ;
diff --git a/src/libs/zlib/Jamfile b/src/libs/zlib/Jamfile
index e7b8ef9dfc..d8592adfa6 100644
--- a/src/libs/zlib/Jamfile
+++ b/src/libs/zlib/Jamfile
@@ -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) ] ;