From 0d6a077db2e6a122188844a148ae474b74723b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Tue, 30 Oct 2012 22:13:34 +0100
Subject: [PATCH] Development: don't link to libs with minor version numbers

This change should be backported to alpha4 (without the zlib part).
---
 build/jam/HaikuImage       | 15 +++++++++++----
 build/jam/OptionalPackages |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 3e59b0e33e..b1e9f0e2c3 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -87,18 +87,18 @@ SYSTEM_LIBS =
 	libbe.so libbsd.so libbnetapi.so
 	libdebug.so libdevice.so
 	libgame.so $(X86_ONLY)libGL.so libgnu.so
-	$(HAIKU_JPEG_CURRENT_LIB)
 	libmail.so libmedia.so libmidi.so libmidi2.so
 	libnetwork.so
-	$(HAIKU_LIBPNG_CURRENT_LIB)
 	<revisioned>libroot.so libroot-addon-icu.so
 	libscreensaver.so
 	libtextencoding.so libtiff.so libtracker.so libtranslation.so
-	$(HAIKU_ZLIB_CURRENT_LIB)
 	$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
-	$(HAIKU_FREETYPE_CURRENT_LIB)
 ;
 PRIVATE_SYSTEM_LIBS =
+	$(HAIKU_JPEG_CURRENT_LIB)
+	$(HAIKU_LIBPNG_CURRENT_LIB)
+	$(HAIKU_ZLIB_CURRENT_LIB) 
+	$(HAIKU_FREETYPE_CURRENT_LIB)
 	libalm.so
 	libfluidsynth.so
 	libilmimf.so
@@ -334,6 +334,13 @@ SYSTEM_LIBS_ALIASES =
 	$(SYSTEM_LIBS_LIBBE_ALIASES)
 ;
 
+OPTIONAL_LIBS_ALIASES =
+	$(HAIKU_FREETYPE_CURRENT_LINK)
+	$(HAIKU_JPEG_CURRENT_LINK)
+	$(HAIKU_LIBPNG_CURRENT_LINK)
+	$(HAIKU_ZLIB_CURRENT_LINK)
+;
+
 # libfreetype.so links to the current freetype lib
 AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LIB:BS)
 	: $(HAIKU_FREETYPE_CURRENT_LINK) : : true ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 255d6387ea..a1c1373082 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -782,7 +782,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
 
 	# library symlinks
 	local lib ;
-	for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs) {
+	for lib in $(SYSTEM_LIBS) $(SYSTEM_LIBS_LIBGL_ALIASES) $(developmentLibs)
+		$(OPTIONAL_LIBS_ALIASES) {
 		AddSymlinkToHaikuHybridImage $(abiDirTokens) lib
 			: /system/lib $(lib:BS) : : true ;
 		local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;