Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/7] libsigrok: don't select libserialport in Config.in
Date: Fri, 20 Feb 2015 13:28:58 +0100	[thread overview]
Message-ID: <1424435342-2188-4-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1424435342-2188-1-git-send-email-bgolaszewski@baylibre.com>

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>
---
 package/libsigrok/Config.in    | 1 -
 package/libsigrok/libsigrok.mk | 7 +++++++
 package/sigrok-cli/Config.in   | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/libsigrok/Config.in b/package/libsigrok/Config.in
index 09077fb..47f812c 100644
--- 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 109d4d3..d19c3c8 100644
--- 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 e3e5420..4e7f137 100644
--- 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
-- 
2.1.4

  parent reply	other threads:[~2015-02-20 12:28 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-20 12:28 [Buildroot] [PATCH 0/7] sigrok fixes and pulseview package Bartosz Golaszewski
2015-02-20 12:28 ` [Buildroot] [PATCH 1/7] libsigrok: remove --disable-udev from CONF_OPTS Bartosz Golaszewski
2015-02-20 12:28 ` [Buildroot] [PATCH 2/7] libserialport: drop untrue statement from Config.in help Bartosz Golaszewski
2015-02-20 12:28 ` Bartosz Golaszewski [this message]
2015-02-20 12:28 ` [Buildroot] [PATCH 4/7] autoconf-archive: new package Bartosz Golaszewski
2015-02-20 18:28   ` Thomas Petazzoni
2015-02-20 12:29 ` [Buildroot] [PATCH 5/7] libsigrok: bump git commit tag Bartosz Golaszewski
2015-02-20 12:29 ` [Buildroot] [PATCH 6/7] libsigrok: enable building C++ bindings Bartosz Golaszewski
2015-02-20 18:30   ` Thomas Petazzoni
2015-02-23 11:23     ` Nicolas Cavallari
2015-02-20 12:29 ` [Buildroot] [PATCH 7/7] pulseview: new package Bartosz Golaszewski
2015-02-20 18:15 ` [Buildroot] [PATCH 0/7] sigrok fixes and pulseview package Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424435342-2188-4-git-send-email-bgolaszewski@baylibre.com \
    --to=bgolaszewski@baylibre.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox