jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 21:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsigrok: don't select libserialport in Config.in

Browse Source 
Libsigrok can be built without libserialport. Don't select it
in Config.in from both libsigrok and sigrok-cli and add a check
to libsigrok.mk to determine whether libserialport should be
enabled.

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-20 13:28:58 +01:00 committed by Thomas Petazzoni
parent 3fa9de28d4
commit 8dee519750
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/libsigrok/Config.in
View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBSIGROK config BR2_PACKAGE_LIBSIGROK
bool "libsigrok" bool "libsigrok"
select BR2_PACKAGE_LIBSERIALPORT
select BR2_PACKAGE_LIBZIP select BR2_PACKAGE_LIBZIP
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
# libglib2 # libglib2

7
package/libsigrok/libsigrok.mk
View File

@ -21,6 +21,13 @@ endef
LIBSIGROK_PRE_CONFIGURE_HOOKS += LIBSIGROK_ADD_MISSING LIBSIGROK_PRE_CONFIGURE_HOOKS += LIBSIGROK_ADD_MISSING
ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y)
LIBSIGROK_CONF_OPTS += --enable-libserialport
LIBSIGROK_DEPENDENCIES += libserialport
else
LIBSIGROK_CONF_OPTS += --disable-libserialport
endif
ifeq ($(BR2_PACKAGE_LIBFTDI),y) ifeq ($(BR2_PACKAGE_LIBFTDI),y)
LIBSIGROK_CONF_OPTS += --enable-libftdi LIBSIGROK_CONF_OPTS += --enable-libftdi
LIBSIGROK_DEPENDENCIES += libftdi LIBSIGROK_DEPENDENCIES += libftdi

1
package/sigrok-cli/Config.in
View File

@ -1,6 +1,5 @@
config BR2_PACKAGE_SIGROK_CLI config BR2_PACKAGE_SIGROK_CLI
bool "sigrok-cli" bool "sigrok-cli"
select BR2_PACKAGE_LIBSERIALPORT
select BR2_PACKAGE_LIBSIGROK select BR2_PACKAGE_LIBSIGROK
# libsigrok->libglib2: # libsigrok->libglib2:
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR