From: Bartosz Golaszewski <brgl@bgdev.pl>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] pulseview: fix a build error
Date: Mon, 3 Dec 2018 15:34:03 +0100 [thread overview]
Message-ID: <20181203143403.18506-1-brgl@bgdev.pl> (raw)
Add a patch that fixes a build error occuring when libsigrokdecode is
not selected.
Fixes: http://autobuild.buildroot.net/results/79ed29bdd1eec9bf7cb5003202da5ceaeb8101b6/
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
---
...ar-fix-build-without-libsigrokdecode.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
diff --git a/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch b/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
new file mode 100644
index 0000000000..5cf0c446a6
--- /dev/null
+++ b/package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
@@ -0,0 +1,37 @@
+From da124df864dd7555733d6690eacf856435d55b2d Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <brgl@bgdev.pl>
+Date: Mon, 3 Dec 2018 13:14:16 +0100
+Subject: [PATCH] mainbar: fix build without libsigrokdecode
+
+We must not include decodesignal.hpp if we're not using libsigrokdecode
+or the build will fail due to libsigrokdecode.hpp not being present in
+the system.
+
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+---
+ pv/toolbars/mainbar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
+index e6beb2b..7c4d0fb 100644
+--- a/pv/toolbars/mainbar.cpp
++++ b/pv/toolbars/mainbar.cpp
+@@ -35,7 +35,6 @@
+
+ #include <boost/algorithm/string/join.hpp>
+
+-#include <pv/data/decodesignal.hpp>
+ #include <pv/devicemanager.hpp>
+ #include <pv/devices/hardwaredevice.hpp>
+ #include <pv/devices/inputfile.hpp>
+@@ -52,6 +51,7 @@
+ #include <pv/widgets/importmenu.hpp>
+ #ifdef ENABLE_DECODE
+ #include <pv/widgets/decodermenu.hpp>
++#include <pv/data/decodesignal.hpp>
+ #endif
+
+ #include <libsigrokcxx/libsigrokcxx.hpp>
+--
+2.19.1
+
--
2.19.1
next reply other threads:[~2018-12-03 14:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 14:34 Bartosz Golaszewski [this message]
2018-12-06 21:09 ` [Buildroot] [PATCH] pulseview: fix a build error Thomas Petazzoni
2018-12-07 8:55 ` Bartosz Golaszewski
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=20181203143403.18506-1-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--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