From ac0cb4e046a677fdd5fcfca74da054bc81f6a2d7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 8 Apr 2017 12:09:13 +0200
Subject: [PATCH] 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.
---
 build/jam/BuildFeatures | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 4312be0371..39bd209cd3 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 {