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

  • From: pulkomandy@xxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 8 Apr 2017 12:09:45 +0200 (CEST)

hrev51077 adds 1 changeset to branch 'master'
old head: 1f09ef45b604f58368f0e46db3cba094d1783f23
new head: ac0cb4e046a677fdd5fcfca74da054bc81f6a2d7
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=ac0cb4e046a6+%5E1f09ef45b604

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

ac0cb4e046a6: Fix build after libwebp update.
  
  The update is only for gcc2 for now. This needs to be adjusted once the
  other archs make the switch too.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

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

Revision:    hrev51077
Commit:      ac0cb4e046a677fdd5fcfca74da054bc81f6a2d7
URL:         http://cgit.haiku-os.org/haiku/commit/?id=ac0cb4e046a6
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Sat Apr  8 10:09:13 2017 UTC

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

1 file changed, 19 insertions(+), 8 deletions(-)
build/jam/BuildFeatures | 27 +++++++++++++++++++--------

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

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 4312be0..39bd209 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -553,14 +553,25 @@ if [ IsPackageAvailable tiff4_devel ] {
 
 # libwebp
 if [ IsPackageAvailable libwebp_devel ] {
-       ExtractBuildFeatureArchives libwebp :
-               file: base libwebp
-                       runtime: lib
-               file: devel libwebp_devel
-                       depends: base
-                       library: $(developLibDir)/libwebp.so.6
-                       headers: $(developHeadersDir) $(developHeadersDir)/webp
-               ;
+       if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+               ExtractBuildFeatureArchives libwebp :
+                       file: base libwebp
+                               runtime: lib
+                       file: devel libwebp_devel
+                               depends: base
+                               library: $(developLibDir)/libwebp.so.7
+                               headers: $(developHeadersDir) 
$(developHeadersDir)/webp
+                       ;
+       } else {
+               ExtractBuildFeatureArchives libwebp :
+                       file: base libwebp
+                               runtime: lib
+                       file: devel libwebp_devel
+                               depends: base
+                               library: $(developLibDir)/libwebp.so.6
+                               headers: $(developHeadersDir) 
$(developHeadersDir)/webp
+                       ;
+       }
 
        EnableBuildFeatures libwebp ;
 } else {


Other related posts:

  • » [haiku-commits] haiku: hrev51077 - build/jam - pulkomandy