aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bartosz Golaszewski <brgl@bgdev.pl>2018-12-03 15:34:03 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-06 22:08:02 +0100
commit30e465465cbe32ddc4f3ea95c769d1b041d9e8a9 (patch)
tree6a880698c8f847dfd1b62d5ffc6c1069e871a30e
parent5c89726d9fe5072dc92bf2c407bd5aebff2703d2 (diff)
downloadbuildroot-30e465465cbe32ddc4f3ea95c769d1b041d9e8a9.tar.gz
buildroot-30e465465cbe32ddc4f3ea95c769d1b041d9e8a9.tar.bz2
package/pulseview: fix a build error with libsigrokdecode disabled
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> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch37
1 files changed, 37 insertions, 0 deletions
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
+