[haiku-commits] haiku: hrev48047 - build/jam src/add-ons/kernel/debugger/qrencode build/jam/repositories/HaikuPorts
- From: jessica.l.hamilton@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 19 Oct 2014 11:42:18 +0200 (CEST)
hrev48047 adds 3 changesets to branch 'master'
old head: 316e9faab02b13e880d08e3ea143c24643ba8ca8
new head: 8e145c66d72df96134b2fc5753f41d1aa3311347
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8e145c6+%5E316e9fa
----------------------------------------------------------------------------
74cb2f7: qrencode_kdl: a KDL-specific version of qrencode library
45b7340: qrencode_kdl: updated recipe that includes the headers
8e145c6: qrencode addon: use KDL-specific qrencode library
Fixes #11351
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 10 insertions(+), 11 deletions(-)
build/jam/BuildFeatures | 13 +++++--------
build/jam/repositories/HaikuPorts/x86_gcc2 | 2 ++
src/add-ons/kernel/debugger/qrencode/Jamfile | 6 +++---
############################################################################
Commit: 74cb2f7a53c5cb2f241738a9b0fe18ff167929e5
URL: http://cgit.haiku-os.org/haiku/commit/?id=74cb2f7
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Sun Oct 19 22:07:16 2014 UTC
qrencode_kdl: a KDL-specific version of qrencode library
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index bcecb6e..8ddf5c9 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -247,6 +247,8 @@ RemotePackageRepository HaikuPorts
qemacs-0.4.0dev-1
qrencode-3.3.0-1
qrencode_devel-3.3.0-1
+ # the non-devel package isn't useful
+ qrencode_kdl_devel-3.3.0-1
readline-6.3-2
readline_devel-6.3-2
roadfighter-1.0.1269-1
############################################################################
Commit: 45b7340f1678e13d8e0c6e24cac14bd1b7a1a4df
URL: http://cgit.haiku-os.org/haiku/commit/?id=45b7340
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Sun Oct 19 22:16:50 2014 UTC
qrencode_kdl: updated recipe that includes the headers
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 8ddf5c9..49c71141 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -248,7 +248,7 @@ RemotePackageRepository HaikuPorts
qrencode-3.3.0-1
qrencode_devel-3.3.0-1
# the non-devel package isn't useful
- qrencode_kdl_devel-3.3.0-1
+ qrencode_kdl_devel-3.3.0-2
readline-6.3-2
readline_devel-6.3-2
roadfighter-1.0.1269-1
############################################################################
Revision: hrev48047
Commit: 8e145c66d72df96134b2fc5753f41d1aa3311347
URL: http://cgit.haiku-os.org/haiku/commit/?id=8e145c6
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Sun Oct 19 22:38:14 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/11351
qrencode addon: use KDL-specific qrencode library
Fixes #11351
----------------------------------------------------------------------------
diff --git a/build/jam/BuildFeatures b/build/jam/BuildFeatures
index 7e0be56..1ce8114 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 0ed225d..fa51044 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 ]
;
Other related posts:
- » [haiku-commits] haiku: hrev48047 - build/jam src/add-ons/kernel/debugger/qrencode build/jam/repositories/HaikuPorts - jessica . l . hamilton
