From 8e145c66d72df96134b2fc5753f41d1aa3311347 Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Sun, 19 Oct 2014 22:38:14 +0000
Subject: [PATCH] qrencode addon: use KDL-specific qrencode library

Fixes #11351
---
 build/jam/BuildFeatures                      | 13 +++++--------
 src/add-ons/kernel/debugger/qrencode/Jamfile |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 7e0be56af3..1ce8114338 100644
--- a/build/jam/BuildFeatures
+++ b/build/jam/BuildFeatures
@@ -473,17 +473,14 @@ if [ IsPackageAvailable libsolv_devel ] {
 
 
 # qrencode
-if [ IsPackageAvailable qrencode_devel ] {
-	ExtractBuildFeatureArchives libqrencode :
-		file: base qrencode
-			runtime: lib
-		file: devel qrencode_devel
-			depends: base
-			library: $(developLibDir)/libqrencode.a
+if [ IsPackageAvailable qrencode_kdl_devel ] {
+	ExtractBuildFeatureArchives libqrencode_kdl :
+		file: devel qrencode_kdl_devel
+			library: $(developLibDir)/libqrencode_kdl.a
 			headers: $(developHeadersDir)
 		;
 
-	EnableBuildFeatures libqrencode ;
+	EnableBuildFeatures libqrencode_kdl ;
 } else {
 	Echo "qrencode support not available on $(TARGET_PACKAGING_ARCH)" ;
 }
diff --git a/src/add-ons/kernel/debugger/qrencode/Jamfile b/src/add-ons/kernel/debugger/qrencode/Jamfile
index 0ed225d8c0..fa51044859 100644
--- a/src/add-ons/kernel/debugger/qrencode/Jamfile
+++ b/src/add-ons/kernel/debugger/qrencode/Jamfile
@@ -2,11 +2,11 @@ SubDir HAIKU_TOP src add-ons kernel debugger qrencode ;
 
 UsePrivateHeaders kernel ;
 
-UseBuildFeatureHeaders libqrencode ;
+UseBuildFeatureHeaders libqrencode_kdl ;
 Includes [ FGristFiles module.cpp ]
-	: [ BuildFeatureAttribute libqrencode : headers ] ;
+	: [ BuildFeatureAttribute libqrencode_kdl : headers ] ;
 
 KernelAddon <kdebug>qrencode :
 	module.cpp
-	: [ BuildFeatureAttribute libqrencode : library ]
+	: [ BuildFeatureAttribute libqrencode_kdl : library ]
 	;