diff options
| author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2015-02-20 13:28:58 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-02-20 18:56:50 +0100 |
| commit | 8dee519750c3ee1a229033eec4cff2e2e80cb54c (patch) | |
| tree | ffe7268daadd0033cd96c921c11d9dc48a37c3f6 | |
| parent | 3fa9de28d4a8dd5c65ee1e54b88e2d53d4e01da1 (diff) | |
| download | buildroot-8dee519750c3ee1a229033eec4cff2e2e80cb54c.tar.gz buildroot-8dee519750c3ee1a229033eec4cff2e2e80cb54c.zip | |
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>
| -rw-r--r-- | package/libsigrok/Config.in | 1 | ||||
| -rw-r--r-- | package/libsigrok/libsigrok.mk | 7 | ||||
| -rw-r--r-- | 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 09077fb79f..47f812c952 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 109d4d3e7a..d19c3c8861 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 e3e5420aba..4e7f137185 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 |
