i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qrencode: use outsourced package

Browse Source 
* qrspec.h isn't yet part of the package for some reason.
* removed qrencode from the bootstrap package.
* only include qrencode when the qrencode package is found.
* didn't check qrencode itself, tests welcome.
This commit is contained in:
Jérôme Duval
2014-04-18 18:10:57 +02:00
parent 3860a01487
commit 607a620b1c
23 changed files with 24 additions and 6029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+18
View File
@@ -351,6 +351,24 @@ 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
headers: $(developHeadersDir)
;
EnableBuildFeatures libqrencode ;
} else {
Echo "qrencode support not available on $(TARGET_PACKAGING_ARCH)" ;
}
# GPL add-ons
if $(HAIKU_INCLUDE_GPL_ADDONS) = 1 {
EnableBuildFeatures gpl ;
build/jam/packages/Haiku
+1 -1
View File
@@ -43,7 +43,7 @@ AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>qrencode
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>qrencode@libqrencode
<kdebug>run_on_exit ;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic
build/jam/packages/HaikuBootstrap
+1 -1
View File
@@ -42,7 +42,7 @@ AddFilesToPackage add-ons kernel busses virtio : virtio_pci ;
AddFilesToPackage add-ons kernel console : vga_text ;
AddFilesToPackage add-ons kernel debugger
: <kdebug>demangle <kdebug>disasm@x86 <kdebug>hangman
<kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>qrencode
<kdebug>invalidate_on_exit <kdebug>usb_keyboard
<kdebug>run_on_exit ;
AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToPackage add-ons kernel generic