NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libsigrok: enable building C++ bindings

Browse Source 
[Thomas:
 - Use BR2_INSTALL_LIBSTDCPP instead of BR2_TOOLCHAIN_BUILDROOT_CXX,
   so that the condition also works with external toolchains.
 - Use a 'if BR2_PACKAGE_LIBSIGROK' instead of duplicating the
   dependency.]

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bartosz Golaszewski 2015-02-23 12:32:48 +01:00 committed by Thomas Petazzoni
parent a5a705d2c9
commit cd3c6e26c5
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/libsigrok/Config.in
View File

@ -16,6 +16,21 @@ config BR2_PACKAGE_LIBSIGROK
http://sigrok.org/wiki/Libsigrok http://sigrok.org/wiki/Libsigrok
if BR2_PACKAGE_LIBSIGROK
config BR2_PACKAGE_LIBSIGROKCXX
bool "build C++ bindings"
select BR2_PACKAGE_GLIBMM
depends on BR2_INSTALL_LIBSTDCPP
help
Build libsigrok C++ bindings as well.
comment "C++ bindings need a toolchain w/ C++"
depends on BR2_PACKAGE_LIBSIGROK
depends on !BR2_INSTALL_LIBSTDCPP
endif
comment "libsigrok needs a toolchain w/ wchar, threads" comment "libsigrok needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

9
package/libsigrok/libsigrok.mk
View File

@ -13,7 +13,7 @@ LIBSIGROK_LICENSE_FILES = COPYING
LIBSIGROK_AUTORECONF = YES LIBSIGROK_AUTORECONF = YES
LIBSIGROK_INSTALL_STAGING = YES LIBSIGROK_INSTALL_STAGING = YES
LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
LIBSIGROK_CONF_OPTS = --disable-bindings --disable-glibtest LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python
define LIBSIGROK_ADD_MISSING define LIBSIGROK_ADD_MISSING
mkdir -p $(@D)/autostuff mkdir -p $(@D)/autostuff
@ -46,4 +46,11 @@ ifeq ($(BR2_PACKAGE_GLIBMM),y)
LIBSIGROK_DEPENDENCIES += glibmm LIBSIGROK_DEPENDENCIES += glibmm
endif endif
ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y)
LIBSIGROK_CONF_OPTS += --enable-cxx
LIBSIGROK_DEPENDENCIES += host-autoconf-archive glibmm
else
LIBSIGROK_CONF_OPTS += --disable-cxx
endif
$(eval $(autotools-package)) $(eval $(autotools-package))