libsigrok: don't select libserialport in Config.in

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>

diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in
index 09077fb79fdd5394785a71631c4ffb49674d68ca..47f812c952b0380f33757be5840e4a443e158f68 100644 (file)
--- a/package/libsigrok/Config.in
+++ b/package/libsigrok/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBSIGROK
        bool "libsigrok"
-       select BR2_PACKAGE_LIBSERIALPORT
        select BR2_PACKAGE_LIBZIP
        select BR2_PACKAGE_LIBGLIB2
        # libglib2

diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk
index 109d4d3e7af07238352048b9c0231450349ee257..d19c3c8861f9e19236eb037997cb68adf92bc01f 100644 (file)
--- a/package/libsigrok/libsigrok.mk
+++ b/package/libsigrok/libsigrok.mk
@@ -21,6 +21,13 @@ endef
 
 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)
 LIBSIGROK_CONF_OPTS += --enable-libftdi
 LIBSIGROK_DEPENDENCIES += libftdi

diff --git a/package/sigrok-cli/Config.in b/package/sigrok-cli/Config.in
index e3e5420abaeca56c69df3c24aa40dc4890a9e8e1..4e7f137185bed857802d23c12bf642fcc3e7d744 100644 (file)
--- a/package/sigrok-cli/Config.in
+++ b/package/sigrok-cli/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SIGROK_CLI
        bool "sigrok-cli"
-       select BR2_PACKAGE_LIBSERIALPORT
        select BR2_PACKAGE_LIBSIGROK
        # libsigrok->libglib2:
        depends on BR2_USE_WCHAR