Skip to contentSkip to conversation

pulseview: fix a build error

PATCH New Bartosz Golaszewski 2 participants 3 messages Dec 3, 2018 – Dec 7, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pulseview: fix a build error

Add a patch that fixes a build error occuring when libsigrokdecode is not selected.

---
 ...ar-fix-build-without-libsigrokdecode.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch new file +37 -0
new file mode 100644
index 0000000000..5cf0c446a6
@@ -0,0 +1,37 @@
+From da124df864dd7555733d6690eacf856435d55b2d Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <[email protected]>
+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 <[email protected]>
+---
+ 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
+
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 pulseview: fix a build error

Hello,

Quoted 9 lines · Bartosz Golaszewski

Add a patch that fixes a build error occuring when libsigrokdecode is not selected.

---
 ...ar-fix-build-without-libsigrokdecode.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch

Applied to master, thanks. I assume you have submitted this patch upstream ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 pulseview: fix a build error

czw., 6 gru 2018 o 22:09 Thomas Petazzoni
<[email protected]> napisa?(a):

Quoted 14 lines

Hello,

Quoted 9 lines · Bartosz Golaszewski

Add a patch that fixes a build error occuring when libsigrokdecode is not selected.

---
 ...ar-fix-build-without-libsigrokdecode.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/pulseview/0001-mainbar-fix-build-without-libsigrokdecode.patch
Quoted 3 lines

Applied to master, thanks. I assume you have submitted this patch upstream ?

That's right.

Bart