[haiku-commits] haiku: hrev44726 - build/jam

From: korli@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Tue, 30 Oct 2012 22:26:47 +0100 (CET)
hrev44726 adds 1 changeset to branch 'master'
old head: 7be608abc4da7fa5912e4cd29d72c9b5434ce44f
new head: 0d6a077db2e6a122188844a148ae474b74723b69

----------------------------------------------------------------------------

0d6a077: Development: don't link to libs with minor version numbers
  
  This change should be backported to alpha4 (without the zlib part).

                                   [ JÃrÃme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44726
Commit:      0d6a077db2e6a122188844a148ae474b74723b69
URL:         http://cgit.haiku-os.org/haiku/commit/?id=0d6a077
Author:      JÃrÃme Duval <jerome.duval@xxxxxxxxx>
Date:        Tue Oct 30 21:13:34 2012 UTC

----------------------------------------------------------------------------

2 files changed, 13 insertions(+), 5 deletions(-)
build/jam/HaikuImage       | 15 +++++++++++----
build/jam/OptionalPackages |  3 ++-

----------------------------------------------------------------------------

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 3e59b0e..b1e9f0e 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 255d638..a1c1373 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) 
] ;
[haiku-commits] haiku: hrev44726 - build/jam

Other related posts:
