Skip to contentSkip to conversation

package/pulseview: fix a build issue

PATCH Superseded Bartosz Golaszewski 2 participants 2 messages May 17, 2017

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/pulseview: fix a build issue

Backport an upstream patch fixing the build issue related to boost math definitions.

---
v1 -> v2:
- backported the upstream patch instead of fixing it myself

 ...txt-Avoid-fext-numeric-literals-not-suppo.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +26 -0
new file mode 100644
index 0000000..3bd05bd
@@ -0,0 +1,26 @@
+From 326f6d8317da370513868946c4a77dea0cd7f913 Mon Sep 17 00:00:00 2001
+From: Uwe Hermann <[email protected]>
+Date: Wed, 17 May 2017 11:00:44 +0200
+Subject: [PATCH 3/3] CMakeLists.txt: Avoid -fext-numeric-literals, (not
+ supported by clang).
+
+This (re-)fixes bug #863.
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e8bc79f..e7e4432 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,6 +395,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
+ add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-Wall -Wextra)
+ add_definitions(-std=c++11)
++add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
+ 
+ if(ENABLE_DECODE)
+ 	add_definitions(-DENABLE_DECODE)
+-- 
+2.9.3
+
Signature · 1 line
2.9.3
#1 lore raw

PATCH v2 1/1 package/pulseview: fix a build issue

Hi Bartosz,

Quoted 18 lines · Bartosz Golaszewski

Backport an upstream patch fixing the build issue related to boost math definitions.

---
v1 -> v2:
- backported the upstream patch instead of fixing it myself

 ...txt-Avoid-fext-numeric-literals-not-suppo.patch | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +0 -0
new file mode 100644
index 0000000..3bd05bd

package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch line 5

Quoted 5 lines
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +5 -0
@@ -0,0 +1,26 @@
+From 326f6d8317da370513868946c4a77dea0cd7f913 Mon Sep 17 00:00:00 2001
+From: Uwe Hermann <[email protected]>
+Date: Wed, 17 May 2017 11:00:44 +0200
+Subject: [PATCH 3/3] CMakeLists.txt: Avoid -fext-numeric-literals, (not
+ supported by clang).

These patch numbers tend to get out of sync overtime. Please generate the patch with the -N parameter of 'git format-patch' to omit the numbering.

package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch line 7

Quoted 2 lines
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +2 -0
+
+This (re-)fixes bug #863.

Please add your sign-off here.

Quoted 6 lines
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +6 -0
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e8bc79f..e7e4432 100644

package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch line 23

Quoted 10 lines
package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch new file +10 -0
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -395,6 +395,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
+ add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-Wall -Wextra)
+ add_definitions(-std=c++11)
++add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
+ 
+ if(ENABLE_DECODE)
+ 	add_definitions(-DENABLE_DECODE)

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -